Squelch some warnings - including some that appear legitimate; the name

of the function was missing from the call for monitorRouteRequest.  It
also appears that the wrong function was being called for
monitorRouteReport.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22049 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c
index b50f96dfe75e6e46657704801ab99dc79545a5fe..f7e3cd8d117bbf02243dbcc2cd0aff1af1c39ccd 100644 (file)
--- a/asn1/inap/packet-inap-template.c
+++ b/asn1/inap/packet-inap-template.c
@@ -423,7 +423,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
   case  98: /*requestReportUTSI*/
        offset = dissect_inap_RequestReportUTSIArg(FALSE, tvb, offset, actx, tree, -1);
     break;
-  case  99: /* ReceivedInformation /*???????*/
+  case  99: /* ReceivedInformation - ???????*/
        offset = dissect_inap_ReceivedInformationArg(FALSE, tvb, offset, actx, tree, -1);
     break;
   case  100: /*sendSTUI*/
@@ -469,10 +469,10 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
        offset = dissect_inap_CallFilteringArg(FALSE, tvb, offset, actx, tree, -1);
     break;
   case  146: /*monitorRouteRequest*/
-       offset = (FALSE, tvb, offset, actx, tree, -1);
+       offset = dissect_inap_MonitorRouteRequestArg(FALSE, tvb, offset, actx, tree, -1);
     break;
   case  147: /*monitorRouteReport*/
-       offset = dissect_inap_MonitorRouteRequestArg(FALSE, tvb, offset, actx, tree, -1);
+       offset = dissect_inap_MonitorRouteReportArg(FALSE, tvb, offset, actx, tree, -1);
     break;
        /*55 ActivityTest*/
    default: 

diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 17c7b1240e34961100a296dbfa1719629a05f90f..d3252604a702ae590b7dedfc31f193a422a2d980 100644 (file)
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-inap.c                                                            */
+/* ./packet-inap.c                                                            */
 /* ../../tools/asn2wrs.py -b -X -e -p inap -c inap.cnf -s packet-inap-template ../ros/Remote-Operations-Information-Objects.asn IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn inap.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn */
 
 /* Input file: packet-inap-template.c */
@@ -8311,7 +8311,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
   case  98: /*requestReportUTSI*/
        offset = dissect_inap_RequestReportUTSIArg(FALSE, tvb, offset, actx, tree, -1);
     break;
-  case  99: /* ReceivedInformation /*???????*/
+  case  99: /* ReceivedInformation - ???????*/
        offset = dissect_inap_ReceivedInformationArg(FALSE, tvb, offset, actx, tree, -1);
     break;
   case  100: /*sendSTUI*/
@@ -8357,10 +8357,10 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
        offset = dissect_inap_CallFilteringArg(FALSE, tvb, offset, actx, tree, -1);
     break;
   case  146: /*monitorRouteRequest*/
-       offset = (FALSE, tvb, offset, actx, tree, -1);
+       offset = dissect_inap_MonitorRouteRequestArg(FALSE, tvb, offset, actx, tree, -1);
     break;
   case  147: /*monitorRouteReport*/
-       offset = dissect_inap_MonitorRouteRequestArg(FALSE, tvb, offset, actx, tree, -1);
+       offset = dissect_inap_MonitorRouteReportArg(FALSE, tvb, offset, actx, tree, -1);
     break;
        /*55 ActivityTest*/
    default: