Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
9b91b013
Commit
9b91b013
authored
Jan 24, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove net_AddressIsMulticast:
it did not work properly (proper check is impossible without blocking)
parent
2dcc933b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
38 deletions
+1
-38
include/vlc_network.h
include/vlc_network.h
+0
-28
modules/gui/wxwidgets/dialogs/wizard.cpp
modules/gui/wxwidgets/dialogs/wizard.cpp
+1
-10
No files found.
include/vlc_network.h
View file @
9b91b013
...
@@ -286,34 +286,6 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)
...
@@ -286,34 +286,6 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)
}
}
/**
* net_AddressIsMulticast
* @return VLC_FALSE iff the psz_addr does not specify a multicast address,
* or the address is not a valid address.
*/
static
inline
vlc_bool_t
net_AddressIsMulticast
(
vlc_object_t
*
p_object
,
const
char
*
psz_addr
)
{
struct
addrinfo
hints
,
*
res
;
memset
(
&
hints
,
0
,
sizeof
(
hints
));
hints
.
ai_socktype
=
SOCK_DGRAM
;
/* UDP */
hints
.
ai_flags
=
AI_NUMERICHOST
;
int
i
=
vlc_getaddrinfo
(
p_object
,
psz_addr
,
0
,
&
hints
,
&
res
);
if
(
i
)
{
msg_Err
(
p_object
,
"invalid address
\"
%s
\"
for net_AddressIsMulticast (%s)"
,
psz_addr
,
vlc_gai_strerror
(
i
));
return
VLC_FALSE
;
}
vlc_bool_t
b
=
net_SockAddrIsMulticast
(
res
->
ai_addr
,
res
->
ai_addrlen
);
vlc_freeaddrinfo
(
res
);
return
b
;
}
static
inline
int
net_GetSockAddress
(
int
fd
,
char
*
address
,
int
*
port
)
static
inline
int
net_GetSockAddress
(
int
fd
,
char
*
address
,
int
*
port
)
{
{
struct
sockaddr_storage
addr
;
struct
sockaddr_storage
addr
;
...
...
modules/gui/wxwidgets/dialogs/wizard.cpp
View file @
9b91b013
...
@@ -1079,16 +1079,7 @@ void wizStreamingMethodPage::OnWizardPageChanging(wxWizardEvent& event)
...
@@ -1079,16 +1079,7 @@ void wizStreamingMethodPage::OnWizardPageChanging(wxWizardEvent& event)
if
(
!
event
.
GetDirection
()
)
return
;
if
(
!
event
.
GetDirection
()
)
return
;
/* Check valid address */
/* Check valid address */
if
(
i_method
==
1
if
(
i_method
==
0
&&
address_txtctrl
->
GetValue
().
IsEmpty
()
)
&&
!
net_AddressIsMulticast
(
(
vlc_object_t
*
)
p_intf
,
address_txtctrl
->
GetValue
().
mb_str
(
wxConvUTF8
))
)
{
wxMessageBox
(
wxU
(
INVALID_MCAST_ADDRESS
)
,
wxU
(
ERROR_MSG
),
wxICON_WARNING
|
wxOK
,
this
->
p_parent
);
event
.
Veto
();
}
else
if
(
i_method
==
0
&&
address_txtctrl
->
GetValue
().
IsEmpty
()
)
{
{
wxMessageBox
(
wxU
(
NO_ADDRESS_TEXT
)
,
wxU
(
ERROR_MSG
),
wxMessageBox
(
wxU
(
NO_ADDRESS_TEXT
)
,
wxU
(
ERROR_MSG
),
wxICON_WARNING
|
wxOK
,
this
->
p_parent
);
wxICON_WARNING
|
wxOK
,
this
->
p_parent
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment