From f007bfc5ee6a519243ef685bbd228d76a5d23972 Mon Sep 17 00:00:00 2001
From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Date: Sun, 26 Feb 2012 17:58:50 -0300
Subject: [PATCH] Hardening the match methods through asserts.

---
 src/icmp/icmpv4packet.cpp  |    8 ++++++++
 src/icmp/icmpv6packet.cpp  |   10 +++++++++-
 src/tcp/tcpipv4segment.cpp |    4 ++++
 src/tcp/tcpipv6segment.cpp |    4 ++++
 4 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/icmp/icmpv4packet.cpp b/src/icmp/icmpv4packet.cpp
index 3bd148b..89f038d 100644
--- a/src/icmp/icmpv4packet.cpp
+++ b/src/icmp/icmpv4packet.cpp
@@ -8,6 +8,8 @@
 
 #include <iostream>
 
+#include <boost/assert.hpp>
+
 #include <logfunc.hpp>
 
 using namespace std;
@@ -100,6 +102,8 @@ bool Icmpv4Packet::match_echo_reply(
         const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v4() );
+
     return match( Icmpv4Type_EchoReply, identifier, sequence_number, source_address );
 }
 
@@ -120,6 +124,8 @@ bool Icmpv4Packet::match_destination_unreachable(
         const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v4() );
+
     return match( Icmpv4Type_DestinationUnreachable, identifier, sequence_number, source_address );
 }
 
@@ -141,6 +147,8 @@ bool Icmpv4Packet::match(
         const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v4() );
+
     bool type_match = IcmpPayloadHeader.get_type() == type ? true : false;
     bool identifier_match = IcmpPayloadHeader.get_identifier() == identifier ? true: false;
     bool seq_num_match = IcmpPayloadHeader.get_sequence_number() == sequence_number ? true : false;
diff --git a/src/icmp/icmpv6packet.cpp b/src/icmp/icmpv6packet.cpp
index 20d9123..e31c863 100644
--- a/src/icmp/icmpv6packet.cpp
+++ b/src/icmp/icmpv6packet.cpp
@@ -8,6 +8,8 @@
 
 #include <iostream>
 
+#include <boost/assert.hpp>
+
 #include <logfunc.hpp>
 
 using namespace std;
@@ -100,6 +102,8 @@ bool Icmpv6Packet::match_echo_reply(
         const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v6() );
+
     return match( Icmpv6Type_EchoReply, identifier, sequence_number, source_address );
 }
 
@@ -120,6 +124,8 @@ bool Icmpv6Packet::match_destination_unreachable(
         const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v6() );
+
     return match( Icmpv6Type_DestinationUnreachable, identifier, sequence_number, source_address );
 }
 
@@ -138,9 +144,11 @@ bool Icmpv6Packet::match(
         const Icmpv6Type type,
         const uint16_t identifier,
         const uint16_t sequence_number,
-        const address &/*source_address*/
+        const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v6() );
+
     bool type_match = IcmpPayloadHeader.get_type() == type ? true : false;
     bool identifier_match = IcmpPayloadHeader.get_identifier() == identifier ? true: false;
     bool seq_num_match = IcmpPayloadHeader.get_sequence_number() == sequence_number ? true : false;
diff --git a/src/tcp/tcpipv4segment.cpp b/src/tcp/tcpipv4segment.cpp
index 8dc663c..0994bae 100644
--- a/src/tcp/tcpipv4segment.cpp
+++ b/src/tcp/tcpipv4segment.cpp
@@ -20,6 +20,8 @@
 
 #include "tcp/tcpipv4segment.h"
 
+#include <boost/assert.hpp>
+
 #include <logfunc.hpp>
 
 using namespace std;
@@ -92,6 +94,8 @@ bool TcpIpv4Segment::match_rst_reply(
         const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v4() );
+
     Ipv4Header ipv4_header = get_ip_header();
     TcpHeader tcp_header = get_tcp_header();
 
diff --git a/src/tcp/tcpipv6segment.cpp b/src/tcp/tcpipv6segment.cpp
index 00c9734..d110a04 100644
--- a/src/tcp/tcpipv6segment.cpp
+++ b/src/tcp/tcpipv6segment.cpp
@@ -20,6 +20,8 @@
 
 #include "tcp/tcpipv6segment.h"
 
+#include <boost/assert.hpp>
+
 #include <logfunc.hpp>
 
 using namespace std;
@@ -92,6 +94,8 @@ bool TcpIpv6Segment::match_rst_reply(
         const address &source_address
 ) const
 {
+    BOOST_ASSERT( source_address.is_v6() );
+
     Ipv6Header ipv6_header = get_ip_header();
     TcpHeader tcp_header = get_tcp_header();
 
-- 
1.7.1