aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2005-12-20 18:38:13 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2005-12-20 18:38:13 +0000
commit7cd691bd43f863623b2781069bb75e13a84564be (patch)
tree8e22c2ce32b23e3ef9945a481c7474997b414964
parent7e204dfddaa547ad601aaf75008e8c10a2e50283 (diff)
From jaap Keuter:
Taking a random dissector from the list on the Wiki I picked packet-enip.c. Nothing wrong with this one, I still ememified it. From Bart Braem: packet-mip.c does not have support for all registration denials by the foreign agent, code 77 was left out. The attached patch fixes that. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16868 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--epan/dissectors/packet-enip.c7
-rw-r--r--epan/dissectors/packet-mip.c1
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index a06e92329b..0347d58184 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -38,6 +38,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/emem.h>
#include <prefs.h>
#include "packet-tcp.h"
#include "packet-cip.h"
@@ -226,7 +227,7 @@ add_byte_array_text_to_proto_tree( proto_tree *tree, tvbuff_t *tvb, gint start,
}
tmp = (char *)tvb_get_ptr( tvb, start, tmp_length );
- tmp2 = (char*)g_malloc( tmp2_length );
+ tmp2 = (char *)ep_alloc( tmp2_length );
tmp2start = tmp2;
@@ -246,12 +247,10 @@ add_byte_array_text_to_proto_tree( proto_tree *tree, tvbuff_t *tvb, gint start,
*tmp2++ = '.';
}
- *tmp2 = 0;
+ *tmp2 = '\0';
pi = proto_tree_add_text( tree, tvb, start, length, "%s%s", str, tmp2start );
- g_free( tmp2start );
-
return( pi );
} /* end of add_byte_array_text_to_proto_tree() */
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index ff6f1dd424..04266f2463 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -98,6 +98,7 @@ static const value_string mip_reply_codes[]= {
{74, "Reg Deny (FA)- Requested Reverse Tunnel Unavailable"},
{75, "Reg Deny (FA)- Reverse Tunnel is Mandatory and 'T' Bit Not Set"},
{76, "Reg Deny (FA)- Mobile Node Too Distant"},
+ {77, "Reg Deny (FA)- Invalid Care-of Address"},
{79, "Reg Deny (FA)- Delivery Style Not Supported"},
{80, "Reg Deny (FA)- Home Network Unreachable"},
{81, "Reg Deny (FA)- HA Host Unreachable"},