Merge pull request #5639 from qlyoung/fix-zebra-ptm-double-free

[mirror_frr.git] / isisd / isis_bpf.c

diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
index 4e9aef47adf0f17f87fec51944dd4c498a720bea..e916a50883c3b54fcabde940f03ddb68f7d5cb6b 100644 (file)
--- a/isisd/isis_bpf.c
+++ b/isisd/isis_bpf.c
@@ -65,10 +65,13 @@ uint8_t *readbuff = NULL;
  * ISO 10589 - 8.4.8
  */
 
-uint8_t ALL_L1_ISS[6] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x14};
-uint8_t ALL_L2_ISS[6] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x15};
-uint8_t ALL_ISS[6] = {0x09, 0x00, 0x2B, 0x00, 0x00, 0x05};
-uint8_t ALL_ESS[6] = {0x09, 0x00, 0x2B, 0x00, 0x00, 0x04};
+static const uint8_t ALL_L1_ISS[6] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x14};
+static const uint8_t ALL_L2_ISS[6] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x15};
+#if 0
+/* missing support for P2P-over-LAN / ES-IS on BSD */
+static const uint8_t ALL_ISS[6] = {0x09, 0x00, 0x2B, 0x00, 0x00, 0x05};
+static const uint8_t ALL_ESS[6] = {0x09, 0x00, 0x2B, 0x00, 0x00, 0x04};
+#endif
 
 static char sock_buff[8192];
 
@@ -187,7 +190,7 @@ int isis_sock_init(struct isis_circuit *circuit)
 {
        int retval = ISIS_OK;
 
-       frr_elevate_privs(&isisd_privs) {
+       frr_with_privs(&isisd_privs) {
 
                retval = open_bpf_dev(circuit);