[PATCH 0/2] iptraf-ng: use pkt_ip_protocol()

[Vitezslav Samel]

Vitezslav Samel (2):
  use pkt_ip_protocol() in place of ip6_hdr->ip6_nxt
  use pkt_ip_protocol() in place of iphdr->protocol

src/itrafmon.c |   12 ++++++------
 src/packet.c   |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

[PATCH 1/2] use pkt_ip_protocol() in place of ip6_hdr->ip6_nxt

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel 
---
 src/itrafmon.c |    6 +++---
 src/packet.c   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/itrafmon.c b/src/itrafmon.c
index c0c8373..42bbcc4 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -1083,7 +1083,7 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter,
    					addentry(&table, 0, 0,
    						 (uint8_t *) &pkt.ip6_hdr->ip6_src.s6_addr,
    						 (uint8_t *) &pkt.ip6_hdr->ip6_dst.s6_addr,
-							 sport, dport, pkt.ip6_hdr->ip6_nxt,
+							 sport, dport, pkt_ip_protocol(&pkt),
    						 ifname, &revlook, rvnfd,
    						 options->servnames);
    			if (tcpentry != NULL) {
@@ -1201,14 +1201,14 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter,
    			       options->servnames, fragment);

} else {
-			if (pkt.ip6_hdr->ip6_nxt == IPPROTO_ICMPV6
+			if (pkt_ip_protocol(&pkt) == IPPROTO_ICMPV6
    		    && (((struct icmp6_hdr *) transpacket)->icmp6_type == ICMP6_DST_UNREACH))
    			process_dest_unreach(&table, (char *) transpacket,
    					     ifname);

add_othp_entry(&othptbl, &pkt, 0, 0,
    			       &pkt.ip6_hdr->ip6_src, &pkt.ip6_hdr->ip6_dst,
-				       IS_IP, pkt.ip6_hdr->ip6_nxt,
+				       IS_IP, pkt_ip_protocol(&pkt),
    			       (char *) transpacket, ifname,
    			       &revlook, rvnfd,
    			       logging, logfile, options->servnames,
diff --git a/src/packet.c b/src/packet.c
index 0c262be..d0b04e4 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -295,7 +295,7 @@ again:
    	char *ip_payload = (char *) ip6 + pkt_iph_len(pkt);

//TODO: Filter packets
-		switch (ip6->ip6_nxt) {	/* FIXME: extension headers ??? */
+		switch (pkt_ip_protocol(pkt)) {
    	case IPPROTO_TCP:
    		tcp = (struct tcphdr *) ip_payload;
    		if (sport)

[PATCH 2/2] use pkt_ip_protocol() in place of iphdr->protocol

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel 
---
 src/itrafmon.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/itrafmon.c b/src/itrafmon.c
index 42bbcc4..4c64cac 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -1075,7 +1075,7 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter,
    						 (unsigned long) pkt.iphdr->saddr,
    						 (unsigned long) pkt.iphdr->daddr,
    						 NULL, NULL, sport, dport,
-							 pkt.iphdr->protocol,
+							 pkt_ip_protocol(&pkt),
    						 ifname, &revlook, rvnfd,
    						 options->servnames);
    			else
@@ -1180,7 +1180,7 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter,
    	} else if (pkt.iphdr) {
    		fragment =  ((ntohs(pkt.iphdr->frag_off) & 0x1fff) != 0);

-			if (pkt.iphdr->protocol == IPPROTO_ICMP) {
+			if (pkt_ip_protocol(&pkt) == IPPROTO_ICMP) {

/*
    			 * Cancel the corresponding TCP entry if an ICMP
@@ -1194,7 +1194,7 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter,
    		}
    		add_othp_entry(&othptbl, &pkt, pkt.iphdr->saddr,
    			       pkt.iphdr->daddr, NULL, NULL, IS_IP,
-				       pkt.iphdr->protocol,
+				       pkt_ip_protocol(&pkt),
    			       (char *) transpacket,
    			       ifname, &revlook, rvnfd,
    			       logging, logfile,

[Nikola Pajkovsky]

Vitezslav Samel  writes:
> Vitezslav Samel (2):
>   use pkt_ip_protocol() in place of ip6_hdr->ip6_nxt
>   use pkt_ip_protocol() in place of iphdr->protocol
>
> src/itrafmon.c |   12 ++++++------
>  src/packet.c   |    2 +-
>  2 files changed, 7 insertions(+), 7 deletions(-)

applied. thanks.