Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Menu
Open sidebar
NTPsec
ntpsec
Commits
aa95af03
Commit
aa95af03
authored
Sep 15, 2016
by
Eric S. Raymond
Browse files
TESTFRAME: Pack pkt extension blocks correctly.
parent
3c328fe1
Changes
1
Hide whitespace changes
Inline
Side-by-side
ntpd/ntp_intercept.c
View file @
aa95af03
...
...
@@ -662,6 +662,10 @@ static char *lfpdump(l_fp *fp)
return
buf
;
}
#define BIGEND_BYTESHIFT(i, m) (8 * ((m) - (i % (m))))
#define BIGEND_GETBYTE(u32, i) (((u32) >> BIGEND_BYTESHIFT(i, 4)) & 0xff)
#define BIGEND_PUTBYTE(b, i) (((b) & 0xff) << BIGEND_BYTESHIFT(i, 4))
static
void
packet_dump
(
char
*
buf
,
size_t
buflen
,
sockaddr_u
*
dest
,
struct
pkt
*
pkt
,
size_t
len
)
{
...
...
@@ -686,7 +690,7 @@ static void packet_dump(char *buf, size_t buflen,
/* dump MAC as len - LEN_PKT_NOMAC chars in hex */
for
(
i
=
0
;
i
+
LEN_PKT_NOMAC
<
len
;
i
++
)
{
snprintf
(
buf
+
strlen
(
buf
),
buflen
-
strlen
(
buf
),
"%02x"
,
pkt
->
exten
[
i
]
);
"%02x"
,
BIGEND_GETBYTE
(
pkt
->
exten
[
i
/
sizeof
(
uint32_t
)],
i
)
);
}
}
...
...
@@ -736,7 +740,7 @@ static size_t packet_parse(char *pktbuf, struct pkt *pkt)
fprintf
(
stderr
,
"ntpd: bad hexval format at line %d
\n
"
,
lineno
);
exit
(
1
);
}
pkt
->
exten
[
i
]
=
hexval
&
0xff
;
pkt
->
exten
[
i
/
sizeof
(
uint32_t
)
]
|
=
BIGEND_PUTBYTE
(
hexval
,
i
)
;
++
pktlen
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment