diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-15 06:36:17 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-15 06:36:17 +0000 |
| commit | 31547dee95f50787b8da24231d1c715589b444e4 (patch) | |
| tree | d57c667807243447009d71a611a7afd6f1d00295 /asn1/ulp | |
| parent | 726820fd03ae031586a41e39984b8e9013060f4a (diff) | |
| download | wireshark-31547dee95f50787b8da24231d1c715589b444e4.tar.gz | |
regenerated with new asn2eth
svn path=/trunk/; revision=18158
Diffstat (limited to 'asn1/ulp')
| -rw-r--r-- | asn1/ulp/Makefile.nmake | 2 | ||||
| -rw-r--r-- | asn1/ulp/packet-ulp-template.c | 2 | ||||
| -rw-r--r-- | asn1/ulp/ulp.cnf | 12 |
3 files changed, 4 insertions, 12 deletions
diff --git a/asn1/ulp/Makefile.nmake b/asn1/ulp/Makefile.nmake index 5ddf0d924f..1773367156 100644 --- a/asn1/ulp/Makefile.nmake +++ b/asn1/ulp/Makefile.nmake @@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2eth.py ULP.asn packet-ulp-template.c packet-ulp-template.h ulp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c ulp.cnf -s packet-ulp-template ULP.asn + $(PYTHON) ../../tools/asn2eth.py -u -e -p $(PROTOCOL_NAME) -c ulp.cnf -s packet-ulp-template ULP.asn !ELSE @echo Error: You need Python to use asn2eth.py @exit 1 diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c index ca278c4c8c..5efc728e6b 100644 --- a/asn1/ulp/packet-ulp-template.c +++ b/asn1/ulp/packet-ulp-template.c @@ -65,8 +65,6 @@ static int proto_ulp = -1; static gint ett_ulp = -1; #include "packet-ulp-ett.c" -guint32 StatusCode_value_map[20] = {0, 1, 2, 3, 4, 5, 6, 7, 8 ,9 ,10 ,11, 12, 13, 14, 15, 16, 17, 100 , 101}; - /* Include constants */ #include "packet-ulp-val.h" diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index 2c875d9a32..500f854146 100644 --- a/asn1/ulp/ulp.cnf +++ b/asn1/ulp/ulp.cnf @@ -15,17 +15,9 @@ ULP-PDU if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - per_aligment_type_callback(FALSE); %(DEFAULT_BODY)s -#.FN_BODY StatusCode -# Remove once asn2eth is fixed to handle PER Enummeration extensions - offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, - 19, NULL, NULL, TRUE, 0, StatusCode_value_map); - -#.FN_PARS UlpMessage VAL_PTR = &UlpMessage - -#.FN_BODY UlpMessage +#.FN_BODY UlpMessage VAL_PTR = &UlpMessage guint32 UlpMessage; @@ -35,7 +27,9 @@ guint32 UlpMessage; { col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ", val_to_str(UlpMessage,ulp_UlpMessage_vals,"Unknown")); } +#.END #.TYPE_ATTR IPv4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL IPv6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL + |