From: David Lamparter <equinox@opensourcerouting.org>
Date: Fri, 25 Aug 2017 23:52:12 +0000 (+0200)
Subject: isisd: bpf: ETHER_HDR_LEN -> ETH_ALEN
X-Git-Tag: frr-4.0-dev~373^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F1049%2Fhead;p=mirror%2Ffrr.git

isisd: bpf: ETHER_HDR_LEN -> ETH_ALEN

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
index 98f612f827..2c8b126088 100644
--- a/isisd/isis_bpf.c
+++ b/isisd/isis_bpf.c
@@ -48,14 +48,15 @@
 extern struct zebra_privs_t isisd_privs;
 
 struct bpf_insn llcfilter[] = {
-	BPF_STMT(BPF_LD + BPF_B + BPF_ABS,
-		 ETHER_HDR_LEN), /* check first byte */
+	/* check first byte */
+	BPF_STMT(BPF_LD + BPF_B + BPF_ABS, ETH_ALEN),
 	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ISO_SAP, 0, 5),
-	BPF_STMT(BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN + 1),
-	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ISO_SAP, 0,
-		 3), /* check second byte */
-	BPF_STMT(BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN + 2),
-	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0x03, 0, 1), /* check third byte */
+	/* check second byte */
+	BPF_STMT(BPF_LD + BPF_B + BPF_ABS, ETH_ALEN + 1),
+	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ISO_SAP, 0, 3),
+	/* check third byte */
+	BPF_STMT(BPF_LD + BPF_B + BPF_ABS, ETH_ALEN + 2),
+	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0x03, 0, 1),
 	BPF_STMT(BPF_RET + BPF_K, (u_int)-1),
 	BPF_STMT(BPF_RET + BPF_K, 0)};
 u_int readblen = 0;
@@ -243,15 +244,14 @@ int isis_recv_pdu_bcast(struct isis_circuit *circuit, u_char *ssnpa)
 
 	assert(bpf_hdr->bh_caplen == bpf_hdr->bh_datalen);
 
-	offset = bpf_hdr->bh_hdrlen + LLC_LEN + ETHER_HDR_LEN;
+	offset = bpf_hdr->bh_hdrlen + LLC_LEN + ETH_ALEN;
 
 	/* then we lose the BPF, LLC and ethernet headers */
 	stream_write(circuit->rcv_stream, readbuff + offset,
-		     bpf_hdr->bh_caplen - LLC_LEN - ETHER_HDR_LEN);
+		     bpf_hdr->bh_caplen - LLC_LEN - ETH_ALEN);
 	stream_set_getp(circuit->rcv_stream, 0);
 
-	memcpy(ssnpa, readbuff + bpf_hdr->bh_hdrlen + ETH_ALEN,
-	       ETH_ALEN);
+	memcpy(ssnpa, readbuff + bpf_hdr->bh_hdrlen + ETH_ALEN, ETH_ALEN);
 
 	if (ioctl(circuit->fd, BIOCFLUSH, &one) < 0)
 		zlog_warn("Flushing failed: %s", safe_strerror(errno));
@@ -265,7 +265,7 @@ int isis_send_pdu_bcast(struct isis_circuit *circuit, int level)
 	ssize_t written;
 	size_t buflen;
 
-	buflen = stream_get_endp(circuit->snd_stream) + LLC_LEN + ETHER_HDR_LEN;
+	buflen = stream_get_endp(circuit->snd_stream) + LLC_LEN + ETH_ALEN;
 	if (buflen > sizeof(sock_buff)) {
 		zlog_warn(
 			"isis_send_pdu_bcast: sock_buff size %zu is less than "
@@ -291,12 +291,12 @@ int isis_send_pdu_bcast(struct isis_circuit *circuit, int level)
 	/*
 	 * Then the LLC
 	 */
-	sock_buff[ETHER_HDR_LEN] = ISO_SAP;
-	sock_buff[ETHER_HDR_LEN + 1] = ISO_SAP;
-	sock_buff[ETHER_HDR_LEN + 2] = 0x03;
+	sock_buff[ETH_ALEN] = ISO_SAP;
+	sock_buff[ETH_ALEN + 1] = ISO_SAP;
+	sock_buff[ETH_ALEN + 2] = 0x03;
 
 	/* then we copy the data */
-	memcpy(sock_buff + (LLC_LEN + ETHER_HDR_LEN), circuit->snd_stream->data,
+	memcpy(sock_buff + (LLC_LEN + ETH_ALEN), circuit->snd_stream->data,
 	       stream_get_endp(circuit->snd_stream));
 
 	/* now we can send this */