Commit Graph

21 Commits

Author SHA1 Message Date
Michael Mann 471f21181b Have X.25 dissector pass boolean q_bit_set value through dissector data rather than pinfo->private_data.
Other "related" dissectors weren't manipulating pinfo->private_data, so it doesn't make sense for them to bother saving/restore it (now that q_bit_set isn't being used)

svn path=/trunk/; revision=52894
2013-10-27 16:03:11 +00:00
Pascal Quantin efe18f199c Convert a few dissectors from emem to wmem API
svn path=/trunk/; revision=51983
2013-09-12 20:37:30 +00:00
Jakub Zawadzki 5fa2a99087 Keep result of [new_]register_dissector in some dissectors.
svn path=/trunk/; revision=51156
2013-08-05 18:09:43 +00:00
Anders Broman 04766017df - [-Wmissing-prototypes]
- explicit casts.

svn path=/trunk/; revision=48282
2013-03-13 21:14:20 +00:00
Bill Meier f10906369a Remove some unneeded parens in hf[] entries;
svn path=/trunk/; revision=47340
2013-01-29 13:33:04 +00:00
Guy Harris e2b61c828f Constify some character pointer variables to avoid warnings about
strings being assigned to them.

svn path=/trunk/; revision=46653
2012-12-21 05:34:38 +00:00
Bill Meier 19d2c33091 Cleanup:
- Ethereal --> Wireshark;
- gerald@ethereal.com --> gerald@wireshark.org;
- update FSF address;
- remove unneeded #includes;
- Fix ENC args for proto_tree_add_item() & etc;
- simplify/remove proto_reg_handoff...() as appropriate;
- remove some boilerplate comments;
- move proto_register...() and proto_reg_handoff...() to
   the end of the file as per convention;
- remove some unneeded initializers.
- simplify some code;
- replace "" in hf[] blurb by NULL.


svn path=/trunk/; revision=45728
2012-10-22 20:46:47 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Guy Harris e79e7c59f8 Use libwireshark's xDLC handling functions and macros to process the
control field.  This means processing the AX.25 header data in one pass.

The field after the control field is the "protocol identifier" field,
not the "packet identifier" field.

svn path=/trunk/; revision=44772
2012-09-04 20:42:21 +00:00
Guy Harris c25adfe420 Newer version of the AX.25 spec.
svn path=/trunk/; revision=44236
2012-08-03 02:05:33 +00:00
Guy Harris 307e13d9f2 Move the list of AX.25 protocol IDs to epan/ax25_pids.h. Use it in
packet-ax25.c and packet-arp.c.

Add an "ax25.pid" dissector table for those protocol IDs, use it in the
AX.25 dissector, and have dissectors register in that table with their
protocol IDs.

Get rid of some unneeded includes.

Clean up some "AX25"s in user-visible strings - say "AX.25" instead.

Clean up some indentation.

svn path=/trunk/; revision=44235
2012-08-03 01:58:12 +00:00
Guy Harris ad3c303f16 Make the protocol ID field an integral field with a value_string table;
use that table for setting the column as well.

dissect_xdlc_control() sets the Info column; don't set it ourselves
(dissect_xdlc_control() will overwrite it if called).

That means we should always call dissect_xdlc_control(), regardless of
whether we're building a protocol tree or not.  Just get rid of the test
for that.

Append the protocol ID, if present, to the column.

svn path=/trunk/; revision=44234
2012-08-03 01:02:27 +00:00
Guy Harris b61be307a1 From Richard Stearn: AX.25 "No layer 3" support.
Also, [at]ify his e-mail address, and list packet-ax25.c before the
packet-ax25-XXX.c dissectors in the file lists.

svn path=/trunk/; revision=44228
2012-08-02 21:53:47 +00:00
Guy Harris 94eb487df6 From Richard Stearn: Rose (X.25 Packet Layer Protocol atop AX.25's
link-layer protocol) support.

Rename rose_handle to x25_handle, as it's not a handle for a protocol
named "Rose" or "ROSE", it's a handle for X.25's Packet Layer Protocol
(which we just call "x.25").

svn path=/trunk/; revision=44226
2012-08-02 20:41:50 +00:00
Guy Harris bb78da2687 Clean up indentation.
Get rid of capture_XXX routines that just bump ld->other.

*Do* bump ld->arp for AX.25 ARP packets.

Note that, as there's IP-over-NetROM, capture_netrom() should check for
it.

svn path=/trunk/; revision=44225
2012-08-02 19:42:59 +00:00
Guy Harris 10e2a00573 From Richard Stearn: Flexnet support.
Also, get rid of check_col() calls and unused preferences, and use
col_add_fstr() where appropriate.

Fix up some indentation.

svn path=/trunk/; revision=44222
2012-08-02 19:28:08 +00:00
Jeff Morriss 9b625975db Don't use dissector_add(): it's long since deprecated.
svn path=/trunk/; revision=44220
2012-08-02 19:01:58 +00:00
Guy Harris 25080346fd From Richard Stearn: AX.25 NetROM support.
Also add packet-ax25.c to the CMake list.

svn path=/trunk/; revision=44217
2012-08-02 18:38:40 +00:00
Jörg Mayer a0855ab987 Fix:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c:164:7: error: variable ‘v2cmdresp’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c: In function ‘proto_register_ax25’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c:398:12: error: variable ‘ax25_module’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=44214
2012-08-02 18:15:44 +00:00
Guy Harris 86bf808c15 From Richard Stearn: IP-over-AX.25 and AX.25 ARP.
svn path=/trunk/; revision=44212
2012-08-02 17:48:18 +00:00
Guy Harris 835111692f From Richard Stearn: support for AX.25, including support for
LINKTYPE_AX25.

svn path=/trunk/; revision=44211
2012-08-02 16:54:43 +00:00