diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 10:01:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 10:01:36 +0100 |
| commit | dc78a21a21568a389cf214ff29113f99286d644a (patch) | |
| tree | ef919a6eedf02a20128dd2b8a7f008353698a1cc /package/traceroute/patches/patch-traceroute_mod-dccp_c | |
| parent | e96c649294fd763fa8631b866397a07b9434bbd3 (diff) | |
| parent | 191b566ae5e66d2180924a4151f67e635fd12ad5 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/traceroute/patches/patch-traceroute_mod-dccp_c')
| -rw-r--r-- | package/traceroute/patches/patch-traceroute_mod-dccp_c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/package/traceroute/patches/patch-traceroute_mod-dccp_c b/package/traceroute/patches/patch-traceroute_mod-dccp_c new file mode 100644 index 000000000..18dcbedaf --- /dev/null +++ b/package/traceroute/patches/patch-traceroute_mod-dccp_c @@ -0,0 +1,55 @@ +--- traceroute-2.0.19.orig/traceroute/mod-dccp.c 2012-11-19 16:51:53.000000000 +0100 ++++ traceroute-2.0.19/traceroute/mod-dccp.c 2013-12-29 20:01:35.000000000 +0100 +@@ -30,7 +30,7 @@ static unsigned int dest_port = 0; + static int raw_sk = -1;
+ static int last_ttl = 0;
+
+-static u_int8_t buf[1024]; /* enough, enough... */
++static uint8_t buf[1024]; /* enough, enough... */
+ static size_t csum_len = 0;
+ static struct dccp_hdr *dh = NULL;
+ static struct dccp_hdr_ext *dhe = NULL;
+@@ -51,8 +51,8 @@ static int dccp_init (const sockaddr_any + int af = dest->sa.sa_family;
+ sockaddr_any src;
+ socklen_t len;
+- u_int8_t *ptr;
+- u_int16_t *lenp;
++ uint8_t *ptr;
++ uint16_t *lenp;
+
+
+ dest_addr = *dest;
+@@ -117,10 +117,10 @@ static int dccp_init (const sockaddr_any + ptr += len;
+ }
+
+- lenp = (u_int16_t *) ptr;
+- ptr += sizeof (u_int16_t);
+- *((u_int16_t *) ptr) = htons ((u_int16_t) IPPROTO_DCCP);
+- ptr += sizeof (u_int16_t);
++ lenp = (uint16_t *) ptr;
++ ptr += sizeof (uint16_t);
++ *((uint16_t *) ptr) = htons ((uint16_t) IPPROTO_DCCP);
++ ptr += sizeof (uint16_t);
+
+
+ /* Construct DCCP header */
+@@ -153,7 +153,7 @@ static int dccp_init (const sockaddr_any + if (csum_len > sizeof (buf))
+ error ("impossible"); /* paranoia */
+
+- len = ptr - (u_int8_t *) dh;
++ len = ptr - (uint8_t *) dh;
+ if (len & 0x03) error ("impossible"); /* as >>2 ... */
+
+ *lenp = htons (len);
+@@ -232,7 +232,7 @@ static probe *dccp_check_reply (int sk, + char *buf, size_t len) {
+ probe *pb;
+ struct dccp_hdr *ndh = (struct dccp_hdr *) buf;
+- u_int16_t sport, dport;
++ uint16_t sport, dport;
+
+
+ if (len < 8) return NULL; /* too short */
|