fix ipv6 header setup in pseudo pkt creation

remotes/origin/master-1.2.x
Anoop Saldanha 14 years ago committed by Victor Julien
parent 416b463c51
commit f514b141ce

@ -58,6 +58,7 @@ typedef struct IPV6Hdr_
#define IPV6_GET_RAW_HLIM(ip6h) ((ip6h)->s_ip6_hlim) #define IPV6_GET_RAW_HLIM(ip6h) ((ip6h)->s_ip6_hlim)
#define IPV6_SET_RAW_VER(ip6h, value) ((ip6h)->s_ip6_vfc = (((ip6h)->s_ip6_vfc & 0x0f) | (value << 4))) #define IPV6_SET_RAW_VER(ip6h, value) ((ip6h)->s_ip6_vfc = (((ip6h)->s_ip6_vfc & 0x0f) | (value << 4)))
#define IPV6_SET_RAW_NH(ip6h, value) ((ip6h)->s_ip6_nxt = (value))
#define IPV6_SET_L4PROTO(p,proto) (p)->ip6vars.l4proto = proto #define IPV6_SET_L4PROTO(p,proto) (p)->ip6vars.l4proto = proto

@ -4553,6 +4553,7 @@ void StreamTcpSetSessionNoReassemblyFlag (TcpSession *ssn, char direction)
(nipv6h)->ip6_dst[1] = (ipv6h)->ip6_src[1]; \ (nipv6h)->ip6_dst[1] = (ipv6h)->ip6_src[1]; \
(nipv6h)->ip6_dst[2] = (ipv6h)->ip6_src[2]; \ (nipv6h)->ip6_dst[2] = (ipv6h)->ip6_src[2]; \
(nipv6h)->ip6_dst[3] = (ipv6h)->ip6_src[3]; \ (nipv6h)->ip6_dst[3] = (ipv6h)->ip6_src[3]; \
IPV6_SET_RAW_NH(nipv6h, IPV6_GET_RAW_NH(ipv6h)); \
} while (0) } while (0)
#define PSEUDO_PKT_SET_TCPHDR(ntcph,tcph) do { \ #define PSEUDO_PKT_SET_TCPHDR(ntcph,tcph) do { \
@ -4646,10 +4647,10 @@ void StreamTcpPseudoPacketSetupHeader(Packet *np, Packet *p)
PSEUDO_PKT_SET_TCPHDR(np->tcph, p->tcph); PSEUDO_PKT_SET_TCPHDR(np->tcph, p->tcph);
/* Setup the adress and port details */ /* Setup the adress and port details */
SET_IPV6_SRC_ADDR(np, &np->src); SET_IPV6_SRC_ADDR(p, &np->src);
SET_IPV6_DST_ADDR(np, &np->dst); SET_IPV6_DST_ADDR(p, &np->dst);
SET_TCP_SRC_PORT(np, &np->sp); SET_TCP_SRC_PORT(p, &np->sp);
SET_TCP_DST_PORT(np, &np->dp); SET_TCP_DST_PORT(p, &np->dp);
} }
/* we don't need a payload (if any) */ /* we don't need a payload (if any) */

Loading…
Cancel
Save