diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2009-03-30 17:59:21 -0700 |
---|---|---|
committer | Sam Roberts <vieuxtech@gmail.com> | 2009-03-30 17:59:21 -0700 |
commit | 633599a72995f8f91ff55758b515e61049fb688a (patch) | |
tree | 8f1eb765f44b5436ad998d19316ae8bd20222e81 | |
parent | 2fe8da3a8e01ecc8697e529de5cbba5a502473b5 (diff) | |
download | libnet-633599a72995f8f91ff55758b515e61049fb688a.tar.gz |
patch was merged with last commit
-rw-r--r-- | unmerged/ipv6_icmpv4.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/unmerged/ipv6_icmpv4.patch b/unmerged/ipv6_icmpv4.patch deleted file mode 100644 index 5b98685..0000000 --- a/unmerged/ipv6_icmpv4.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: src/libnet_build_ip.c -=================================================================== ---- src/libnet_build_ip.c (revision 382) -+++ src/libnet_build_ip.c (working copy) -@@ -557,8 +557,12 @@ - } - - /* no checksum for IPv6 */ -- return (ptag ? ptag : libnet_pblock_update(l, p, LIBNET_IPV6_H, -- LIBNET_PBLOCK_IPV6_H)); -+ ptag = ptag ? ptag : libnet_pblock_update(l, p, LIBNET_IPV6_H, -+ LIBNET_PBLOCK_IPV6_H); -+ -+ libnet_pblock_record_ip_offset(l, p); -+ -+ return ptag; - bad: - libnet_pblock_delete(l, p); - return (-1); -Index: src/libnet_pblock.c -=================================================================== ---- src/libnet_pblock.c (revision 382) -+++ src/libnet_pblock.c (working copy) -@@ -502,7 +509,7 @@ - libnet_pblock_t *c; - u_int32_t ip_offset = 0; - -- assert(p->type == LIBNET_PBLOCK_IPV4_H); -+ assert(p->type == LIBNET_PBLOCK_IPV4_H || p->type == LIBNET_PBLOCK_IPV6_H); - - for(c = p; c; c = c->prev) - ip_offset += c->b_len; |