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
38f2d19f
Commit
38f2d19f
authored
11 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
Add support for AF_UNIX.
parent
6557e863
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/xpdev/multisock.c
+43
-14
43 additions, 14 deletions
src/xpdev/multisock.c
with
43 additions
and
14 deletions
src/xpdev/multisock.c
+
43
−
14
View file @
38f2d19f
...
...
@@ -5,6 +5,7 @@
#include
<string.h>
#include
<gen_defs.h>
#include
<sockwrap.h>
#include
<dirwrap.h>
#include
<multisock.h>
struct
xpms_set
*
xpms_create
(
unsigned
int
retries
,
unsigned
int
wait_secs
,
...
...
@@ -48,24 +49,49 @@ BOOL xpms_add(struct xpms_set *xpms_set, int domain, int type,
{
struct
xpms_sockdef
*
new_socks
;
struct
addrinfo
hints
;
struct
addrinfo
*
res
;
struct
addrinfo
*
res
=
NULL
;
struct
addrinfo
*
cur
;
unsigned
int
added
=
0
;
int
ret
;
char
port_str
[
6
];
memset
(
&
hints
,
0
,
sizeof
(
hints
));
hints
.
ai_flags
=
AI_PASSIVE
;
hints
.
ai_family
=
domain
;
hints
.
ai_socktype
=
type
;
hints
.
ai_protocol
=
protocol
;
hints
.
ai_flags
|=
AI_NUMERICSERV
;
hints
.
ai_flags
|=
AI_ADDRCONFIG
;
sprintf
(
port_str
,
"%hu"
,
port
);
if
((
ret
=
getaddrinfo
(
addr
,
port_str
,
&
hints
,
&
res
))
!=
0
)
{
if
(
xpms_set
->
lprintf
)
xpms_set
->
lprintf
(
LOG_CRIT
,
"!ERROR %d calling getaddrinfo() on %s"
,
ret
,
addr
);
return
FALSE
;
#ifndef _WIN32
struct
addrinfo
dummy
;
struct
sockaddr_un
un_addr
;
if
(
domain
==
AF_UNIX
)
{
memset
(
&
dummy
,
0
,
sizeof
(
dummy
));
dummy
.
ai_family
=
AF_UNIX
;
dummy
.
ai_socktype
=
type
;
dummy
.
ai_addr
=
(
struct
sockaddr
*
)
&
un_addr
;
un_addr
.
sun_family
=
AF_UNIX
;
if
(
strlen
(
addr
)
>=
sizeof
(
un_addr
.
sun_path
))
{
if
(
xpms_set
->
lprintf
)
xpms_set
->
lprintf
(
LOG_ERR
,
"!ERROR %s is too long for a AF_UNIX socket"
,
addr
);
return
FALSE
;
}
strcpy
(
un_addr
.
sun_path
,
addr
);
if
(
fexist
(
addr
))
unlink
(
addr
);
dummy
.
ai_addrlen
=
sizeof
(
un_addr
);
res
=
&
dummy
;
}
#endif
if
(
res
==
NULL
)
{
memset
(
&
hints
,
0
,
sizeof
(
hints
));
hints
.
ai_flags
=
AI_PASSIVE
;
hints
.
ai_family
=
domain
;
hints
.
ai_socktype
=
type
;
hints
.
ai_protocol
=
protocol
;
hints
.
ai_flags
|=
AI_NUMERICSERV
;
hints
.
ai_flags
|=
AI_ADDRCONFIG
;
sprintf
(
port_str
,
"%hu"
,
port
);
if
((
ret
=
getaddrinfo
(
addr
,
port_str
,
&
hints
,
&
res
))
!=
0
)
{
if
(
xpms_set
->
lprintf
)
xpms_set
->
lprintf
(
LOG_CRIT
,
"!ERROR %d calling getaddrinfo() on %s"
,
ret
,
addr
);
return
FALSE
;
}
}
for
(
cur
=
res
;
cur
;
cur
=
cur
->
ai_next
)
{
...
...
@@ -126,7 +152,10 @@ BOOL xpms_add(struct xpms_set *xpms_set, int domain, int type,
xpms_set
->
sock_count
++
;
}
freeaddrinfo
(
res
);
#ifndef _WIN32
if
(
res
!=
&
dummy
)
#endif
freeaddrinfo
(
res
);
if
(
added
)
return
TRUE
;
return
FALSE
;
...
...
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