aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

decode/icmpv6: remove unused L4 header pointers from Packet

Browse Source 
Not used, so no need to keep them.

Part of effort to make Packet more compact.

Ticket: #6938.
pull/10971/head
Victor Julien 11 months ago committed by Victor Julien
parent a22047b770
commit 521c968079
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File

15
src/decode-icmpv6.c
Unescape Escape View File

@ -86,9 +86,10 @@ static void DecodePartialIPV6(Packet *p, uint8_t *partial_packet, uint16_t len )
switch (icmp6_ip6h->s_ip6_nxt) {
case IPPROTO_TCP:
if (len >= IPV6_HEADER_LEN + TCP_HEADER_LEN ) {
p->icmpv6vars.emb_tcph = (TCPHdr*)(partial_packet + IPV6_HEADER_LEN);
p->icmpv6vars.emb_sport = p->icmpv6vars.emb_tcph->th_sport;
p->icmpv6vars.emb_dport = p->icmpv6vars.emb_tcph->th_dport;
TCPHdr *emb_tcph = (TCPHdr *)(partial_packet + IPV6_HEADER_LEN);
p->icmpv6vars.emb_sport = emb_tcph->th_sport;
p->icmpv6vars.emb_dport = emb_tcph->th_dport;
p->icmpv6vars.emb_ports_set = true;
SCLogDebug("ICMPV6->IPV6->TCP header sport: "
"%"PRIu16" dport %"PRIu16"", p->icmpv6vars.emb_sport,
@ -103,9 +104,10 @@ static void DecodePartialIPV6(Packet *p, uint8_t *partial_packet, uint16_t len )
break;
case IPPROTO_UDP:
if (len >= IPV6_HEADER_LEN + UDP_HEADER_LEN ) {
p->icmpv6vars.emb_udph = (UDPHdr*)(partial_packet + IPV6_HEADER_LEN);
p->icmpv6vars.emb_sport = p->icmpv6vars.emb_udph->uh_sport;
p->icmpv6vars.emb_dport = p->icmpv6vars.emb_udph->uh_dport;
UDPHdr *emb_udph = (UDPHdr *)(partial_packet + IPV6_HEADER_LEN);
p->icmpv6vars.emb_sport = emb_udph->uh_sport;
p->icmpv6vars.emb_dport = emb_udph->uh_dport;
p->icmpv6vars.emb_ports_set = true;
SCLogDebug("ICMPV6->IPV6->UDP header sport: "
"%"PRIu16" dport %"PRIu16"", p->icmpv6vars.emb_sport,
@ -119,7 +121,6 @@ static void DecodePartialIPV6(Packet *p, uint8_t *partial_packet, uint16_t len )
break;
case IPPROTO_ICMPV6:
p->icmpv6vars.emb_icmpv6h = (ICMPV6Hdr*)(partial_packet + IPV6_HEADER_LEN);
p->icmpv6vars.emb_sport = 0;
p->icmpv6vars.emb_dport = 0;

12
src/decode-icmpv6.h
Unescape Escape View File

@ -125,13 +125,7 @@
/** macro for icmpv6 embedded "protocol" access */
#define ICMPV6_GET_EMB_PROTO(p) (p)->icmpv6vars.emb_ip6_proto_next
/** macro for icmpv6 embedded "ipv6h" header access */
#define ICMPV6_GET_EMB_IPV6(p) (p)->icmpv6vars.emb_ipv6h
/** macro for icmpv6 embedded "tcph" header access */
#define ICMPV6_GET_EMB_TCP(p) (p)->icmpv6vars.emb_tcph
/** macro for icmpv6 embedded "udph" header access */
#define ICMPV6_GET_EMB_UDP(p) (p)->icmpv6vars.emb_udph
/** macro for icmpv6 embedded "icmpv6h" header access */
#define ICMPV6_GET_EMB_icmpv6h(p) (p)->icmpv6vars.emb_icmpv6h
#define ICMPV6_GET_EMB_IPV6(p) (p)->icmpv6vars.emb_ipv6h
typedef struct ICMPV6Info_
{
@ -167,15 +161,13 @@ typedef struct ICMPV6Vars_ {
/** Pointers to the embedded packet headers */
IPV6Hdr *emb_ipv6h;
TCPHdr *emb_tcph;
UDPHdr *emb_udph;
ICMPV6Hdr *emb_icmpv6h;
/** IPv6 src and dst address */
uint32_t emb_ip6_src[4];
uint32_t emb_ip6_dst[4];
uint8_t emb_ip6_proto_next;
bool emb_ports_set;
/** TCP/UDP ports */
uint16_t emb_sport;
uint16_t emb_dport;

Write Preview
Loading…
Cancel
Save