From 5b97f29a9ad34d86fa92fdee40eb75ebb3ced935 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Fri, 5 Feb 2021 12:00:37 +0000
Subject: [PATCH] packet-fr: Register for SLL dispatch to Frame Relay dissector

Without this patch, any Linux cooked packet capture on HDLC / frame
relay devices will not be dispatched to the proper dissector.

Such packets do carry a proper sll_hatype set to ARPHRD_FRAD and should
be dispatched accordingly.  However, the packet-fr dissector so far
did not register itself accordingly.


(cherry picked from commit b83f92a4580080a968f73b4cda8ca52f2d6332ba)
---
 epan/dissectors/packet-fr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 6a1768ca45..0ebe797ada 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -27,6 +27,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/conversation.h>
+#include <epan/arptypes.h>
 #include <wiretap/wtap.h>
 
 #include "packet-llc.h"
@@ -1117,6 +1118,7 @@ proto_reg_handoff_fr(void)
   dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_FRAME_RELAY, fr_handle);
   dissector_add_uint("atm.aal5.type", TRAF_FR, fr_handle);
   dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_FR, fr_handle);
+  dissector_add_uint("sll.hatype", ARPHRD_FRAD, fr_handle);
 
   fr_phdr_handle = create_dissector_handle(dissect_fr_phdr, proto_fr);
   dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY_WITH_PHDR, fr_phdr_handle);