Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Dnsmasq
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
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
nanahira
Dnsmasq
Commits
98d76a03
Commit
98d76a03
authored
Feb 10, 2012
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweaks to fix compilation on FreeBSD.
parent
6ea6dcf0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
bld/get-version
bld/get-version
+5
-2
src/bpf.c
src/bpf.c
+3
-3
src/dhcp6.c
src/dhcp6.c
+1
-1
src/rfc3315.c
src/rfc3315.c
+1
-1
No files found.
bld/get-version
View file @
98d76a03
...
@@ -9,11 +9,14 @@
...
@@ -9,11 +9,14 @@
# If we can find one which matches $v[0-9].* then we assume it's
# If we can find one which matches $v[0-9].* then we assume it's
# a version-number tag, else we just use the whole string.
# a version-number tag, else we just use the whole string.
# we're called with pwd ==
src
# we're called with pwd ==
TLD
cd
..
cd
..
if
[
-d
.git
]
;
then
if
which git
>
/dev/null 2>&1
&&
[
-d
.git
]
;
then
git describe
git describe
elif
grep
'\$Format:%d\$'
VERSION
>
/dev/null 2>&1
;
then
# unsubstituted VERSION, but no git available.
echo
UNKNOWN
else
else
vers
=
`
cat
VERSION |
sed
's/[(), ]/\n/ g'
|
grep
-m
1
$v
[
0-9]
`
vers
=
`
cat
VERSION |
sed
's/[(), ]/\n/ g'
|
grep
-m
1
$v
[
0-9]
`
...
...
src/bpf.c
View file @
98d76a03
...
@@ -160,11 +160,11 @@ int iface_enumerate(int family, void *parm, int (*callback)())
...
@@ -160,11 +160,11 @@ int iface_enumerate(int family, void *parm, int (*callback)())
unsigned
int
flags
;
unsigned
int
flags
;
if
(
ioctl
(
fd
,
SIOCGIFFLAGS
,
ifr
)
!=
-
1
)
if
(
ioctl
(
fd
,
SIOCGIFFLAGS
,
ifr
)
!=
-
1
)
{
{
flags
=
ifr
.
ifr_flags
;
flags
=
ifr
->
ifr_flags
;
ifr
->
ifr_addr
.
sa_family
=
AF_LINK
;
ifr
->
ifr_addr
.
sa_family
=
AF_LINK
;
if
(
ioctl
(
fd
,
SIOCGIFADDR
,
ifr
)
!=
-
1
&&
if
(
ioctl
(
fd
,
SIOCGIFADDR
,
ifr
)
!=
-
1
&&
!
((
*
callback
)((
unsigned
int
)
htons
(
ETHERTYPE_IP
),
!
((
*
callback
)((
unsigned
int
)
htons
(
ETHERTYPE_IP
),
(
unsigned
int
)
link
->
ifi_
flags
,
flags
,
LLADDR
((
struct
sockaddr_dl
*
)
&
ifr
->
ifr_addr
),
ETHER_ADDR_LEN
,
parm
)))
LLADDR
((
struct
sockaddr_dl
*
)
&
ifr
->
ifr_addr
),
ETHER_ADDR_LEN
,
parm
)))
goto
err
;
goto
err
;
}
}
...
...
src/dhcp6.c
View file @
98d76a03
...
@@ -212,7 +212,7 @@ void dhcp6_packet(time_t now)
...
@@ -212,7 +212,7 @@ void dhcp6_packet(time_t now)
lease_prune
(
NULL
,
now
);
/* lose any expired leases */
lease_prune
(
NULL
,
now
);
/* lose any expired leases */
msg
.
msg_iov
=
&
daemon
->
dhcp_packet
;
msg
.
msg_iov
=
&
daemon
->
dhcp_packet
;
sz
=
dhcp6_reply
(
parm
.
current
,
if_index
,
ifr
.
ifr_name
,
sz
,
IN6_IS_ADDR_MULTICAST
(
&
from
),
now
);
sz
=
dhcp6_reply
(
parm
.
current
,
if_index
,
ifr
.
ifr_name
,
sz
,
IN6_IS_ADDR_MULTICAST
(
&
from
.
in6
.
sin6_addr
),
now
);
lease_update_file
(
now
);
lease_update_file
(
now
);
lease_update_dns
();
lease_update_dns
();
...
...
src/rfc3315.c
View file @
98d76a03
...
@@ -467,7 +467,7 @@ static int dhcp6_no_relay(int msg_type, struct dhcp_netid *tags, struct dhcp_con
...
@@ -467,7 +467,7 @@ static int dhcp6_no_relay(int msg_type, struct dhcp_netid *tags, struct dhcp_con
int
iaid
,
ia_type
=
opt6_type
(
opt
);
int
iaid
,
ia_type
=
opt6_type
(
opt
);
void
*
ia_option
,
*
ia_end
;
void
*
ia_option
,
*
ia_end
;
unsigned
int
min_time
=
0xffffffff
;
unsigned
int
min_time
=
0xffffffff
;
int
t1cntr
;
int
t1cntr
=
0
;
int
address_assigned
=
0
;
int
address_assigned
=
0
;
if
(
ia_type
!=
OPTION6_IA_NA
&&
ia_type
!=
OPTION6_IA_TA
)
if
(
ia_type
!=
OPTION6_IA_NA
&&
ia_type
!=
OPTION6_IA_TA
)
...
...
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