Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
5ecf99b4
Commit
5ecf99b4
authored
11 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
Use the new union xp_sockaddr
parent
23d2491d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/xpdev/multisock.c
+2
-2
2 additions, 2 deletions
src/xpdev/multisock.c
src/xpdev/multisock.h
+1
-1
1 addition, 1 deletion
src/xpdev/multisock.h
with
3 additions
and
3 deletions
src/xpdev/multisock.c
+
2
−
2
View file @
5ecf99b4
...
@@ -169,7 +169,7 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
...
@@ -169,7 +169,7 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
return
one_good
;
return
one_good
;
}
}
SOCKET
xpms_accept
(
struct
xpms_set
*
xpms_set
,
struct
sockaddr
*
addr
,
SOCKET
xpms_accept
(
struct
xpms_set
*
xpms_set
,
union
xp_
sockaddr
*
addr
,
socklen_t
*
addrlen
,
unsigned
int
timeout
,
void
**
cb_data
)
socklen_t
*
addrlen
,
unsigned
int
timeout
,
void
**
cb_data
)
{
{
fd_set
read_fs
;
fd_set
read_fs
;
...
@@ -208,7 +208,7 @@ SOCKET xpms_accept(struct xpms_set *xpms_set, struct sockaddr * addr,
...
@@ -208,7 +208,7 @@ SOCKET xpms_accept(struct xpms_set *xpms_set, struct sockaddr * addr,
if
(
FD_ISSET
(
xpms_set
->
socks
[
i
].
sock
,
&
read_fs
))
{
if
(
FD_ISSET
(
xpms_set
->
socks
[
i
].
sock
,
&
read_fs
))
{
if
(
cb_data
)
if
(
cb_data
)
*
cb_data
=
xpms_set
->
socks
[
i
].
cb_data
;
*
cb_data
=
xpms_set
->
socks
[
i
].
cb_data
;
return
accept
(
xpms_set
->
socks
[
i
].
sock
,
addr
,
addrlen
);
return
accept
(
xpms_set
->
socks
[
i
].
sock
,
&
addr
->
addr
,
addrlen
);
}
}
if
(
FD_ISSET
(
xpms_set
->
socks
[
i
].
sock
,
&
except_fs
))
{
if
(
FD_ISSET
(
xpms_set
->
socks
[
i
].
sock
,
&
except_fs
))
{
closesocket
(
xpms_set
->
socks
[
i
].
sock
);
closesocket
(
xpms_set
->
socks
[
i
].
sock
);
...
...
This diff is collapsed.
Click to expand it.
src/xpdev/multisock.h
+
1
−
1
View file @
5ecf99b4
...
@@ -39,7 +39,7 @@ BOOL xpms_add(struct xpms_set *xpms_set, int domain, int type,
...
@@ -39,7 +39,7 @@ BOOL xpms_add(struct xpms_set *xpms_set, int domain, int type,
BOOL
xpms_add_list
(
struct
xpms_set
*
xpms_set
,
int
domain
,
int
type
,
BOOL
xpms_add_list
(
struct
xpms_set
*
xpms_set
,
int
domain
,
int
type
,
int
protocol
,
str_list_t
list
,
uint16_t
default_port
,
const
char
*
prot
,
int
protocol
,
str_list_t
list
,
uint16_t
default_port
,
const
char
*
prot
,
void
(
*
sock_init
)(
SOCKET
,
void
*
),
int
(
*
bind_init
)(
BOOL
),
void
*
cbdata
);
void
(
*
sock_init
)(
SOCKET
,
void
*
),
int
(
*
bind_init
)(
BOOL
),
void
*
cbdata
);
SOCKET
xpms_accept
(
struct
xpms_set
*
,
struct
sockaddr
*
addr
,
SOCKET
xpms_accept
(
struct
xpms_set
*
,
union
xp_
sockaddr
*
addr
,
socklen_t
*
addrlen
,
unsigned
int
timeout
,
void
**
cb_data
);
socklen_t
*
addrlen
,
unsigned
int
timeout
,
void
**
cb_data
);
#ifdef __cplusplus
#ifdef __cplusplus
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment