projects
/
liboping.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/liboping.c: Simplify packet creation and parsing.
[liboping.git]
/
src
/
liboping.c
diff --git
a/src/liboping.c
b/src/liboping.c
index
dd9da46
..
f8c5bfb
100644
(file)
--- a/
src/liboping.c
+++ b/
src/liboping.c
@@
-1,6
+1,6
@@
/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-201
1
Florian octo Forster <ff at octo.it>
+ * Copyright (C) 2006-201
6
Florian octo Forster <ff at octo.it>
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
@@
-298,23
+298,20
@@
static pinghost_t *ping_receive_ipv4 (pingobj_t *obj, char *buffer,
buffer += ip_hdr_len;
buffer_len -= ip_hdr_len;
buffer += ip_hdr_len;
buffer_len -= ip_hdr_len;
- if (buffer_len <
sizeof (struct icmp)
)
+ if (buffer_len <
ICMP_MINLEN
)
return (NULL);
icmp_hdr = (struct icmp *) buffer;
return (NULL);
icmp_hdr = (struct icmp *) buffer;
- buffer += sizeof (struct icmp);
- buffer_len -= sizeof (struct icmp);
-
if (icmp_hdr->icmp_type != ICMP_ECHOREPLY)
{
if (icmp_hdr->icmp_type != ICMP_ECHOREPLY)
{
- dprintf ("Unexpected ICMP type: %
i
\n", icmp_hdr->icmp_type);
+ dprintf ("Unexpected ICMP type: %
"PRIu8"
\n", icmp_hdr->icmp_type);
return (NULL);
}
recv_checksum = icmp_hdr->icmp_cksum;
return (NULL);
}
recv_checksum = icmp_hdr->icmp_cksum;
+ /* This writes to buffer. */
icmp_hdr->icmp_cksum = 0;
icmp_hdr->icmp_cksum = 0;
- calc_checksum = ping_icmp4_checksum ((char *) icmp_hdr,
- sizeof (struct icmp) + buffer_len);
+ calc_checksum = ping_icmp4_checksum (buffer, buffer_len);
if (recv_checksum != calc_checksum)
{
if (recv_checksum != calc_checksum)
{
@@
-392,12
+389,12
@@
static pinghost_t *ping_receive_ipv6 (pingobj_t *obj, char *buffer,
pinghost_t *ptr;
pinghost_t *ptr;
- if (buffer_len <
sizeof (struct icmp6_hdr)
)
+ if (buffer_len <
ICMP_MINLEN
)
return (NULL);
icmp_hdr = (struct icmp6_hdr *) buffer;
return (NULL);
icmp_hdr = (struct icmp6_hdr *) buffer;
- buffer +=
sizeof (struct icmp)
;
- buffer_len -=
sizeof (struct icmp)
;
+ buffer +=
ICMP_MINLEN
;
+ buffer_len -=
ICMP_MINLEN
;
if (icmp_hdr->icmp6_type != ICMP6_ECHO_REPLY)
{
if (icmp_hdr->icmp6_type != ICMP6_ECHO_REPLY)
{
@@
-815,29
+812,28
@@
static int ping_send_one_ipv4 (pingobj_t *obj, pinghost_t *ph)
struct icmp *icmp4;
int status;
struct icmp *icmp4;
int status;
- char
buf[4096]
;
-
int
buflen;
+ char
buf[4096] = {0}
;
+
size_t
buflen;
char *data;
char *data;
-
int
datalen;
+
size_t
datalen;
dprintf ("ph->hostname = %s\n", ph->hostname);
dprintf ("ph->hostname = %s\n", ph->hostname);
- memset (buf, '\0', sizeof (buf));
icmp4 = (struct icmp *) buf;
icmp4 = (struct icmp *) buf;
- data = (char *) (icmp4 + 1);
-
- icmp4->icmp_type = ICMP_ECHO;
- icmp4->icmp_code = 0;
- icmp4->icmp_cksum = 0;
- icmp4->icmp_id = htons (ph->ident);
- icmp4->icmp_seq = htons (ph->sequence);
+ *icmp4 = (struct icmp) {
+ .icmp_type = ICMP_ECHO,
+ .icmp_id = htons (ph->ident),
+ .icmp_seq = htons (ph->sequence),
+ };
- buflen = 4096 - sizeof (struct icmp);
- strncpy (data, ph->data, buflen);
- datalen = strlen (data);
+ datalen = strlen (ph->data);
+ buflen = ICMP_MINLEN + datalen;
+ if (sizeof (buf) < buflen)
+ return (EINVAL);
- buflen = datalen + sizeof (struct icmp);
+ data = buf + ICMP_MINLEN;
+ memcpy (data, ph->data, datalen);
icmp4->icmp_cksum = ping_icmp4_checksum (buf, buflen);
icmp4->icmp_cksum = ping_icmp4_checksum (buf, buflen);
@@
-860,7
+856,7
@@
static int ping_send_one_ipv6 (pingobj_t *obj, pinghost_t *ph)
struct icmp6_hdr *icmp6;
int status;
struct icmp6_hdr *icmp6;
int status;
- char buf[4096];
+ char buf[4096]
= {0}
;
int buflen;
char *data;
int buflen;
char *data;
@@
-868,23
+864,22
@@
static int ping_send_one_ipv6 (pingobj_t *obj, pinghost_t *ph)
dprintf ("ph->hostname = %s\n", ph->hostname);
dprintf ("ph->hostname = %s\n", ph->hostname);
- memset (buf, '\0', sizeof (buf));
icmp6 = (struct icmp6_hdr *) buf;
icmp6 = (struct icmp6_hdr *) buf;
- data = (char *) (icmp6 + 1);
+ *icmp6 = (struct icmp6_hdr) {
+ .icmp6_type = ICMP6_ECHO_REQUEST,
+ .icmp6_id = htons (ph->ident),
+ .icmp6_seq = htons (ph->sequence),
+ };
- icmp6->icmp6_type = ICMP6_ECHO_REQUEST;
- icmp6->icmp6_code = 0;
- /* The checksum will be calculated by the TCP/IP stack. */
- /* FIXME */
- icmp6->icmp6_cksum = 0;
- icmp6->icmp6_id = htons (ph->ident);
- icmp6->icmp6_seq = htons (ph->sequence);
+ datalen = strlen (ph->data);
+ buflen = sizeof (*icmp6) + datalen;
+ if (sizeof (buf) < buflen)
+ return (EINVAL);
- buflen = 4096 - sizeof (struct icmp6_hdr);
- strncpy (data, ph->data, buflen);
- datalen = strlen (data);
+ data = buf + ICMP_MINLEN;
+ memcpy (data, ph->data, datalen);
- buflen = datalen + sizeof (struct icmp6_hdr);
+ /* The checksum will be calculated by the TCP/IP stack. */
dprintf ("Sending ICMPv6 package with ID 0x%04x\n", ph->ident);
dprintf ("Sending ICMPv6 package with ID 0x%04x\n", ph->ident);