diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-31 09:29:07 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-31 09:29:07 +0000 |
commit | 2d1bb39121cf739517b55c68a84e5d9ad5b31619 (patch) | |
tree | fff9b9d1a5f7445ca000040fe0c8399298acbac8 /asn1 | |
parent | 4343de3513f4a1405f06ca9bdf82c134ac10594e (diff) |
change the signature for the get_pdu_len() function pointer passed to tcp_dissect_pdus() to also include a packet_info pointer.
there are many reasons why some protocols actually need to be able to access the pinfo structure while determining the pdu size
svn path=/trunk/; revision=19751
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 4 | ||||
-rw-r--r-- | asn1/pkixcmp/cmp-exp.cnf | 2 | ||||
-rw-r--r-- | asn1/pkixcmp/packet-cmp-template.c | 2 | ||||
-rw-r--r-- | asn1/ulp/packet-ulp-template.c | 2 | ||||
-rw-r--r-- | asn1/ulp/ulp-exp.cnf | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index aff390fb30..8089774937 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -1128,7 +1128,7 @@ static void dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree * static guint -get_sasl_ldap_pdu_len(tvbuff_t *tvb, int offset) +get_sasl_ldap_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { /* sasl encapsulated ldap is 4 bytes plus the length in size */ return tvb_get_ntohl(tvb, offset)+4; @@ -1142,7 +1142,7 @@ dissect_sasl_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static guint -get_normal_ldap_pdu_len(tvbuff_t *tvb, int offset) +get_normal_ldap_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { guint32 len; gboolean ind; diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf index 7b448b761c..d09232df9e 100644 --- a/asn1/pkixcmp/cmp-exp.cnf +++ b/asn1/pkixcmp/cmp-exp.cnf @@ -1,6 +1,6 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler -# .\cmp-exp.cnf +# ./cmp-exp.cnf # ../../tools/asn2wrs.py -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn #.MODULE diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c index 0c3712e8c7..81d4495f7d 100644 --- a/asn1/pkixcmp/packet-cmp-template.c +++ b/asn1/pkixcmp/packet-cmp-template.c @@ -169,7 +169,7 @@ static void dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p } -static guint get_cmp_pdu_len(tvbuff_t *tvb, int offset) +static guint get_cmp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { guint32 plen; diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c index 5c6157ddb7..a8c478506e 100644 --- a/asn1/ulp/packet-ulp-template.c +++ b/asn1/ulp/packet-ulp-template.c @@ -80,7 +80,7 @@ static gint ett_ulp = -1; static guint -get_ulp_pdu_len(tvbuff_t *tvb, int offset) +get_ulp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { /* PDU length = Message length */ return tvb_get_ntohs(tvb,offset); diff --git a/asn1/ulp/ulp-exp.cnf b/asn1/ulp/ulp-exp.cnf index e22e8936db..3d50fdbdce 100644 --- a/asn1/ulp/ulp-exp.cnf +++ b/asn1/ulp/ulp-exp.cnf @@ -1,7 +1,7 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler -# .\ulp-exp.cnf -# ../../tools/asn2wrs.py -u -e -p ulp -c ulp.cnf -s packet-ulp-template ULP.asn +# ./ulp-exp.cnf +# ../../tools/asn2wrs.py -e -p ulp -c ulp.cnf -s packet-ulp-template ULP.asn #.MODULE ULP ulp |