Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment)

svn path=/trunk/; revision=53802

1 files changed, 8 insertions, 0 deletions

diff --git a/epan/address_to_str.c b/epan/address_to_str.c
index cd012e8429..1ebd0ace4c 100644
--- a/epan/address_to_str.c
+++ b/epan/address_to_str.c
@@ -627,6 +627,14 @@ address_to_str_buf(const address *addr, gchar *buf, int buf_len)
         else
             g_snprintf(buf, buf_len, "0x%04x", ieee_802_15_4_short_addr);
         break;
+    case AT_J1939:
+        addrdata = (const guint8 *)addr->data;
+        g_snprintf(buf, buf_len, "%d", addrdata[0]);
+        break;
+    case AT_DEVICENET:
+        addrdata = (const guint8 *)addr->data;
+        g_snprintf(buf, buf_len, "%d", addrdata[0] & 0x3f);
+        break;
     default:
         g_assert_not_reached();
     }