migrate packet-megaco.c from plugins/megaco to epan/dissectors

svn path=/trunk/; revision=21191

8 files changed, 31 insertions, 5 deletions

diff --git a/asn1/h248/Makefile b/asn1/h248/Makefile
index d00bce3c85..7728ca74a5 100644
--- a/asn1/h248/Makefile
+++ b/asn1/h248/Makefile
@@ -14,3 +14,7 @@ clean:
 
 copy_files: generate_dissector
 	cp $(DISSECTOR_FILES) ../../epan/dissectors
+	touch copy_files
+
+compile: copy_files
+	( cd ../../epan/dissectors && make packet-h248.o )
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index 66dee80b2f..49144e1f33 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -33,6 +33,7 @@
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
+#include <epan/strutil.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -1079,16 +1080,17 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE);
     ranap_tree = proto_item_add_subtree(ranap_item, ett_ranap);
 
+	ProcedureCode = 0xFFFFFFFF;
 	offset = dissect_RANAP_PDU_PDU(tvb, pinfo, ranap_tree);
 
 	if (pinfo->sccp_info) {
 		sccp_msg_info_t* sccp_msg = pinfo->sccp_info;
-		const gchar* str = val_to_str(ProcedureCode, ranap_ProcedureCode_vals,"Unknown RANAP");
 		
 		if (sccp_msg->assoc)
-			sccp_msg->assoc->proto = SCCP_PLOAD_RANAP;
+			sccp_msg->assoc->payload = SCCP_PLOAD_RANAP;
 		
-		if (! sccp_msg->label) {
+		if (! sccp_msg->label && ProcedureCode != 0xFFFFFFFF) {
+			const gchar* str = val_to_str(ProcedureCode, ranap_ProcedureCode_vals,"Unknown RANAP");
 			sccp_msg->label = se_strdup(str);
 		}
 	}
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index 4c2efba880..d23be14d79 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -48,6 +48,21 @@ VAL_PTR = &ProtocolIE_ID
 
 VAL_PTR = &ProtocolIE_ID
 
+#.FN_BODY PermanentNAS-UE-ID/iMSI
+  tvbuff_t* imsi_tvb;
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_ranap_iMSI,
+                                       3, 8, &imsi_tvb);
+  
+	if ( actx->pinfo->sccp_info
+		 && actx->pinfo->sccp_info->assoc
+		 && ! actx->pinfo->sccp_info->assoc->calling_party ) {
+	   
+		guint len = tvb_length(imsi_tvb);
+		guint8* bytes = ep_tvb_memdup(imsi_tvb,0,len);
+
+		actx->pinfo->sccp_info->assoc->calling_party = 
+			se_strdup_printf("IMSI: %%s", bytes_to_str(bytes, len) );
+	}
 #.FN_BODY Value
 	
 	offset = dissect_ranap_messages(tvb, offset, %(ACTX)s, tree);
diff --git a/asn1/snmp/Makefile b/asn1/snmp/Makefile
index 654e4aa988..d61e7d56a8 100644
--- a/asn1/snmp/Makefile
+++ b/asn1/snmp/Makefile
@@ -5,6 +5,7 @@ DISSECTOR_FILES=packet-snmp.c packet-snmp.h
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
+	touch generate_dissector
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py snmp.asn packet-snmp-template.c packet-snmp-template.h snmp.cnf
 	python ../../tools/asn2wrs.py -b -e -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn
@@ -14,3 +15,8 @@ clean:
 
 copy_files: generate_dissector
 	cp $(DISSECTOR_FILES) ../../epan/dissectors
+	touch copy_files
+
+test_compile: copy_files
+	(cd ../../epan/dissectors && make packet-snmp.o)
+	touch test_compile
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 1650a41839..3ffbde4426 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -455,6 +455,7 @@ DISSECTOR_SRC =	\
 	packet-mbtcp.c	\
 	packet-mdshdr.c	\
 	packet-media.c	\
+	packet-megaco.c	\
 	packet-mikey.c	\
 	packet-mip.c	\
 	packet-mip6.c	\
diff --git a/plugins/megaco/packet-megaco.c b/epan/dissectors/packet-megaco.c
index b3a64b1d2b..b3a64b1d2b 100644
--- a/plugins/megaco/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4d7a6b1587..2c0063d58c 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -34,7 +34,6 @@ SUBDIRS = \
 	irda \
 	lwres \
 	mate \
-	megaco \
 	mgcp \
 	opsi \
 	pcli \
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 390122ce26..c081ff06e2 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -20,7 +20,6 @@ all: \
 	irda \
 	lwres \
 	mate \
-	megaco \
 	mgcp \
 	opsi \
 	pcli \