diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-01-24 20:29:32 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-01-24 20:29:32 +0000 |
| commit | 5b5f05c08137c558922611f43750f2b82743f913 (patch) | |
| tree | c3da0cb643aaab1095c5b164335cebf7ea1cf5ed | |
| parent | e9ab825ba51f7b0dd5f95b7bc811693aa12c328c (diff) | |
The AT dissector is not really USB-specific, so rename it from packet-usb-at.c to packet-at.c.
svn path=/trunk/; revision=40703
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-at.c (renamed from epan/dissectors/packet-usb-at.c) | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 8f37dda3bc..cae7cb84fb 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -349,6 +349,7 @@ set(DISSECTOR_SRC dissectors/packet-ascend.c dissectors/packet-asf.c dissectors/packet-assa_r3.c + dissectors/packet-at.c dissectors/packet-atalk.c dissectors/packet-atm.c dissectors/packet-atmtcp.c @@ -1077,7 +1078,6 @@ set(DISSECTOR_SRC dissectors/packet-umts_fp.c dissectors/packet-umts_mac.c dissectors/packet-usb.c - dissectors/packet-usb-at.c dissectors/packet-usb-ccid.c dissectors/packet-usb-hid.c dissectors/packet-usb-hub.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 6db4313b5a..f4f4d0249e 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -267,6 +267,7 @@ DISSECTOR_SRC = \ packet-ascend.c \ packet-asf.c \ packet-assa_r3.c \ + packet-at.c \ packet-atalk.c \ packet-atm.c \ packet-atmtcp.c \ @@ -995,7 +996,6 @@ DISSECTOR_SRC = \ packet-umts_fp.c \ packet-umts_mac.c \ packet-usb.c \ - packet-usb-at.c \ packet-usb-ccid.c \ packet-usb-hid.c \ packet-usb-hub.c \ diff --git a/epan/dissectors/packet-usb-at.c b/epan/dissectors/packet-at.c index 8417c21092..28f993f43e 100644 --- a/epan/dissectors/packet-usb-at.c +++ b/epan/dissectors/packet-at.c @@ -1,5 +1,5 @@ -/* packet-usb-at.c - * Dissector for USB/AT Commands +/* packet-at.c + * Dissector for AT Commands * * Copyright 2011, Tyson Key <tyson.key@gmail.com> * @@ -57,7 +57,7 @@ static gboolean allowed_chars(tvbuff_t *tvb) } /* Experimental approach based upon the one used for PPP */ -static gboolean dissect_usb_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static gboolean heur_dissect_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { const gchar at_magic1[2] = {0x0d, 0x0a}; const gchar at_magic2[3] = {0x0d, 0x0d, 0x0a}; @@ -119,7 +119,7 @@ proto_register_at_command(void) void proto_reg_handoff_at_command(void) { - heur_dissector_add("usb.bulk", dissect_usb_at, proto_at); - heur_dissector_add("usb.control", dissect_usb_at, proto_at); + heur_dissector_add("usb.bulk", heur_dissect_at, proto_at); + heur_dissector_add("usb.control", heur_dissect_at, proto_at); } |