diff options
| author | Sean O. Stalley <sean.stalley@intel.com> | 2014-10-09 11:27:17 -0700 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-09 19:41:19 +0000 |
| commit | 608207fcf68753b861de967205d8a03addaf24f2 (patch) | |
| tree | 7e075b5dc75b1983acffc8ae64b5f17536d01cff /epan | |
| parent | 39b281461d6113134bd5203bca9b4ca27b146cda (diff) | |
Add Dissection of MA packets over UDP
Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6
Reviewed-on: https://code.wireshark.org/review/4576
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-mausb.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index c4ab328cc3..6e75d68aa9 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -631,6 +631,7 @@ static guint mausb_get_pkt_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset /* Global Port Preference */ static unsigned int mausb_tcp_port_pref = 0; +static unsigned int mausb_udp_port_pref = 0; /* Initialize the subtree pointers */ static gint ett_mausb = -1; @@ -1872,6 +1873,11 @@ proto_register_mausb(void) "Set the port for Media Agnostic Packets", 10, &mausb_tcp_port_pref); + /* Register UDP port preference */ + prefs_register_uint_preference(mausb_module, "udp.port", "MAUSB UDP Port", + "Set the port for Media Agnostic Packets", + 10, &mausb_udp_port_pref); + } void @@ -1879,27 +1885,32 @@ proto_reg_handoff_mausb(void) { static gboolean initialized = FALSE; static dissector_handle_t mausb_tcp_handle; + static dissector_handle_t mausb_pkt_handle; static guint saved_mausb_tcp_port_pref; + static guint saved_mausb_udp_port_pref; if (!initialized) { - dissector_handle_t mausb_snap_handle; /* only initialize once */ mausb_tcp_handle = new_create_dissector_handle(dissect_mausb, proto_mausb); - mausb_snap_handle = new_create_dissector_handle(dissect_mausb_pkt, + mausb_pkt_handle = new_create_dissector_handle(dissect_mausb_pkt, proto_mausb); - dissector_add_uint("llc.mausb_pid", PID_MAUSB, mausb_snap_handle); + dissector_add_uint("llc.mausb_pid", PID_MAUSB, mausb_pkt_handle); initialized = TRUE; } else { /* if we have already been initialized */ dissector_delete_uint("tcp.port", saved_mausb_tcp_port_pref, mausb_tcp_handle); + dissector_delete_uint("udp.port", saved_mausb_udp_port_pref, mausb_pkt_handle); } saved_mausb_tcp_port_pref = mausb_tcp_port_pref; + saved_mausb_udp_port_pref = mausb_udp_port_pref; + dissector_add_uint("tcp.port", mausb_tcp_port_pref, mausb_tcp_handle); + dissector_add_uint("udp.port", mausb_udp_port_pref, mausb_pkt_handle); } void |