Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
36ad06ef
Commit
36ad06ef
authored
Oct 28, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn suckaddr into a miniobj
parent
9beaead5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
16 deletions
+28
-16
vsa.c
lib/libvarnish/vsa.c
+28
-16
No files found.
lib/libvarnish/vsa.c
View file @
36ad06ef
...
...
@@ -42,6 +42,7 @@
#include "vas.h"
#include "vsa.h"
#include "vrt.h"
#include "miniobj.h"
/*
* Struct sockaddr{|_in|_in6|_storage} is absolutely the worst data
...
...
@@ -162,6 +163,8 @@
*/
struct
suckaddr
{
unsigned
magic
;
#define SUCKADDR_MAGIC 0x4b1e9335
union
{
struct
sockaddr
sa
;
struct
sockaddr_in
sa4
;
...
...
@@ -179,9 +182,11 @@ const int vsa_suckaddr_len = sizeof(struct suckaddr);
int
VRT_VSA_GetPtr
(
const
struct
suckaddr
*
sua
,
const
unsigned
char
**
dst
)
{
AN
(
dst
);
if
(
sua
==
NULL
)
return
(
-
1
);
CHECK_OBJ_NOTNULL
(
sua
,
SUCKADDR_MAGIC
);
switch
(
sua
->
sa
.
sa_family
)
{
case
PF_INET
:
...
...
@@ -223,7 +228,7 @@ VSA_Malloc(const void *s, unsigned sal)
break
;
}
if
(
l
!=
0
)
{
sua
=
calloc
(
1
,
sizeof
*
sua
);
ALLOC_OBJ
(
sua
,
SUCKADDR_MAGIC
);
if
(
sua
!=
NULL
)
memcpy
(
&
sua
->
sa
,
s
,
l
);
}
...
...
@@ -253,6 +258,8 @@ VSA_Build(void *d, const void *s, unsigned sal)
break
;
}
if
(
l
!=
0
)
{
memset
(
sua
,
0
,
sizeof
*
sua
);
sua
->
magic
=
SUCKADDR_MAGIC
;
memcpy
(
&
sua
->
sa
,
s
,
l
);
return
(
sua
);
}
...
...
@@ -262,7 +269,8 @@ VSA_Build(void *d, const void *s, unsigned sal)
const
struct
sockaddr
*
VSA_Get_Sockaddr
(
const
struct
suckaddr
*
sua
,
socklen_t
*
sl
)
{
AN
(
sua
);
CHECK_OBJ_NOTNULL
(
sua
,
SUCKADDR_MAGIC
);
AN
(
sl
);
switch
(
sua
->
sa
.
sa_family
)
{
case
PF_INET
:
...
...
@@ -278,10 +286,11 @@ VSA_Get_Sockaddr(const struct suckaddr *sua, socklen_t *sl)
}
int
VSA_Sane
(
const
struct
suckaddr
*
s
)
VSA_Sane
(
const
struct
suckaddr
*
s
ua
)
{
CHECK_OBJ_NOTNULL
(
sua
,
SUCKADDR_MAGIC
);
switch
(
s
->
sa
.
sa_family
)
{
switch
(
s
ua
->
sa
.
sa_family
)
{
case
PF_INET
:
case
PF_INET6
:
return
(
1
);
...
...
@@ -291,36 +300,39 @@ VSA_Sane(const struct suckaddr *s)
}
socklen_t
VSA_Len
(
const
struct
suckaddr
*
s
)
VSA_Len
(
const
struct
suckaddr
*
s
ua
)
{
CHECK_OBJ_NOTNULL
(
sua
,
SUCKADDR_MAGIC
);
switch
(
s
->
sa
.
sa_family
)
{
switch
(
s
ua
->
sa
.
sa_family
)
{
case
PF_INET
:
return
(
sizeof
(
s
->
sa4
));
return
(
sizeof
(
s
ua
->
sa4
));
case
PF_INET6
:
return
(
sizeof
(
s
->
sa6
));
return
(
sizeof
(
s
ua
->
sa6
));
default:
return
(
0
);
}
}
int
VSA_Compare
(
const
struct
suckaddr
*
s
1
,
const
struct
suckaddr
*
s
2
)
VSA_Compare
(
const
struct
suckaddr
*
s
ua1
,
const
struct
suckaddr
*
sua
2
)
{
AN
(
s1
);
AN
(
s2
);
return
(
memcmp
(
s1
,
s2
,
vsa_suckaddr_len
));
CHECK_OBJ_NOTNULL
(
sua1
,
SUCKADDR_MAGIC
);
CHECK_OBJ_NOTNULL
(
sua2
,
SUCKADDR_MAGIC
);
return
(
memcmp
(
sua1
,
sua2
,
vsa_suckaddr_len
));
}
unsigned
VSA_Port
(
const
struct
suckaddr
*
s
)
VSA_Port
(
const
struct
suckaddr
*
s
ua
)
{
switch
(
s
->
sa
.
sa_family
)
{
CHECK_OBJ_NOTNULL
(
sua
,
SUCKADDR_MAGIC
);
switch
(
sua
->
sa
.
sa_family
)
{
case
PF_INET
:
return
(
ntohs
(
s
->
sa4
.
sin_port
));
return
(
ntohs
(
s
ua
->
sa4
.
sin_port
));
case
PF_INET6
:
return
(
ntohs
(
s
->
sa6
.
sin6_port
));
return
(
ntohs
(
s
ua
->
sa6
.
sin6_port
));
default:
return
(
0
);
}
...
...
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