From f664110479ba94fce9e594a2db62697a507e56f8 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 7 Oct 2010 21:54:19 +0000 Subject: [PATCH] Update NMAP_MODIFICATIONS for fixed ip6_pack_hdr. --- libdnet-stripped/NMAP_MODIFICATIONS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libdnet-stripped/NMAP_MODIFICATIONS b/libdnet-stripped/NMAP_MODIFICATIONS index 5fad7bc2c..dbf12614d 100644 --- a/libdnet-stripped/NMAP_MODIFICATIONS +++ b/libdnet-stripped/NMAP_MODIFICATIONS @@ -674,6 +674,25 @@ Index: include/dnet/sctp.h /* empty */ } __attribute__((__packed__)); +o Fixed the ip6_pack_hdr macro with respect to traffic class and flow + label. + +Index: include/dnet/ip6.h +=================================================================== +--- include/dnet/ip6.h (revision 20527) ++++ include/dnet/ip6.h (revision 20528) +@@ -164,8 +164,8 @@ + + #define ip6_pack_hdr(hdr, fc, fl, plen, nxt, hlim, src, dst) do { \ + struct ip6_hdr *ip6 = (struct ip6_hdr *)(hdr); \ +- ip6->ip6_flow = htonl(((uint32_t)(fc) << 28) & \ +- (IP6_FLOWLABEL_MASK | (fl))); \ ++ ip6->ip6_flow = htonl(((uint32_t)(fc) << 20) | \ ++ (0x000fffff & (fl))); \ + ip6->ip6_vfc = (IP6_VERSION | ((fc) >> 4)); \ + ip6->ip6_plen = htons((plen)); \ + ip6->ip6_nxt = (nxt); ip6->ip6_hlim = (hlim); \ + ===CHANGES ALREADY MERGED TO UPSTREAM LIBDNET GO BELOW THIS LINE=== o Made some code changes to intf.c (the patch below). This does the following: