Merge pull request #2 from westermo/parse-router-ports

querierctl: Read router ports from bridge-vlan command output

Signed-off-by: Joachim Wiberg <[email protected]>

src/Makefile.am

@@ -15,7 +15,7 @@ querierd_SOURCES  = main.c cfparse.y config.c defs.h	\
 		   igmp.c igmpv2.h igmpv3.h 		\
 		   inet.c ipc.c kern.c log.c 		\
 		   bridge.c pev.c pev.h			\
-		   pathnames.h queue.h
+		   pathnames.h queue.h bitstring.h
 querierd_CPPFLAGS = $(AM_CPPFLAGS)
 querierd_LDADD    = $(LIBS) $(LIBOBJS)
 

src/bitstring.h

@@ -0,0 +1,128 @@
+/*	$OpenBSD: bitstring.h,v 1.6 2020/05/10 00:56:06 guenther Exp $	*/
+/*	$NetBSD: bitstring.h,v 1.5 1997/05/14 15:49:55 pk Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Paul Vixie.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)bitstring.h	8.1 (Berkeley) 7/19/93
+ */
+
+#ifndef _BITSTRING_H_
+#define	_BITSTRING_H_
+
+/* modified for SV/AT and bitstring bugfix by M.R.Murphy, 11oct91
+ * bitstr_size changed gratuitously, but shorter
+ * bit_alloc   spelling error fixed
+ * the following were efficient, but didn't work, they've been made to
+ * work, but are no longer as efficient :-)
+ * bit_nclear, bit_nset, bit_ffc, bit_ffs
+ */
+typedef	unsigned char bitstr_t;
+
+/* internal macros */
+				/* byte of the bitstring bit is in */
+#define	_bit_byte(bit) \
+	((bit) >> 3)
+
+				/* mask for the bit within its byte */
+#define	_bit_mask(bit) \
+	(1 << ((bit)&0x7))
+
+/* external macros */
+				/* bytes in a bitstring of nbits bits */
+#define	bitstr_size(nbits) \
+	(((nbits) + 7) >> 3)
+
+				/* allocate a bitstring */
+#define	bit_alloc(nbits) \
+	(bitstr_t *)calloc((size_t)bitstr_size(nbits), sizeof(bitstr_t))
+
+				/* allocate a bitstring on the stack */
+#define	bit_decl(name, nbits) \
+	((name)[bitstr_size(nbits)])
+
+				/* is bit N of bitstring name set? */
+#define	bit_test(name, bit) \
+	((name)[_bit_byte(bit)] & _bit_mask(bit))
+
+				/* set bit N of bitstring name */
+#define	bit_set(name, bit) \
+	((name)[_bit_byte(bit)] |= _bit_mask(bit))
+
+				/* clear bit N of bitstring name */
+#define	bit_clear(name, bit) \
+	((name)[_bit_byte(bit)] &= ~_bit_mask(bit))
+
+				/* clear bits start ... stop in bitstring */
+#define	bit_nclear(name, start, stop) do { \
+	register bitstr_t *__name = (name); \
+	register int __start = (start), __stop = (stop); \
+	while (__start <= __stop) { \
+		bit_clear(__name, __start); \
+		__start++; \
+		} \
+} while(0)
+
+				/* set bits start ... stop in bitstring */
+#define	bit_nset(name, start, stop) do { \
+	register bitstr_t *__name = (name); \
+	register int __start = (start), __stop = (stop); \
+	while (__start <= __stop) { \
+		bit_set(__name, __start); \
+		__start++; \
+		} \
+} while(0)
+
+				/* find first bit clear in name */
+#define	bit_ffc(name, nbits, value) do { \
+	register bitstr_t *__name = (name); \
+	register int __bit, __nbits = (nbits), __value = -1; \
+	for (__bit = 0; __bit < __nbits; ++__bit) \
+		if (!bit_test(__name, __bit)) { \
+			__value = __bit; \
+			break; \
+		} \
+	*(value) = __value; \
+} while(0)
+
+				/* find first bit set in name */
+#define	bit_ffs(name, nbits, value) do { \
+	register bitstr_t *__name = (name); \
+	register int __bit, __nbits = (nbits), __value = -1; \
+	for (__bit = 0; __bit < __nbits; ++__bit) \
+		if (bit_test(__name, __bit)) { \
+			__value = __bit; \
+			break; \
+		} \
+	*(value) = __value; \
+} while(0)
+
+#endif /* !_BITSTRING_H_ */

src/bridge.c

@@ -22,6 +22,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <netinet/if_ether.h>
+#include "bitstring.h"
 #include "defs.h"
 #include "queue.h"
 
@@ -209,25 +210,57 @@ void bridge_prop(FILE *fp, char *prop, int setval)
 
 void bridge_router_ports(FILE *fp)
 {
+	char cmd[80], buf[80];
 	FILE *rfp;
-	char buf[80];
 	int num = 0;
+	int in_rport_context = 0;
+	int ret;
+	bitstr_t bit_decl(seen, CHAR_BIT * sizeof(unsigned long));
 
-	rfp = fopen(bridge_path("multicast_router_ports"), "r");
+	ret = snprintf(cmd, sizeof(cmd), "bridge -s vlan global show dev %s", br);
+	if (ret < 0 || ret >= (int)sizeof(cmd))
+		goto fail;
+	rfp = popen(cmd, "r");
 	if (!rfp)
 		goto fail;
 
+	/*
+	 * Parse output from bridge -s vlan global:
+	 * > bridge -s vlan global show br0
+	 * port              vlan-id
+	 * br0               1
+	 *                     mcast_snooping 1 mcast_querier 1 ...
+	 *                     router ports: eth2     0.00 temp
+	 *                                   eth1    29.01 temp
+	 *                   2
+	 *                     mcast_snooping 1 mcast_querier 1 ...
+	 *                     router ports: eth2    19.04 temp
+	 */
 	while (fgets(buf, sizeof(buf), rfp)) {
+		const char *fmt;
 		char ifname[20];
-		int timer;
+		float timer;
 
-		sscanf(buf, "%s %d", ifname, &timer);
-		if (timer >= 1) {
-			fprintf(fp, "%s%s", num ? ", " : "", ifname);
-			num++;
-		}
+		if (in_rport_context)
+			fmt = " %19s %2f temp";
+		else
+			fmt = " router ports: %19s %2f temp";
+
+		if (sscanf(buf, fmt, ifname, &timer) == 2) {
+			unsigned int ifi = if_nametoindex(ifname);
+
+			logit(LOG_DEBUG, 0, "Found router port %s (%lu) with %.2f s timeout\n", ifname, ifi, timer);
+			if (timer > 0.0 && ifi && !bit_test(seen, ifi)) {
+				fprintf(fp, "%s%s", num ? ", " : "", ifname);
+				num++;
+				bit_set(seen, ifi);
+			}
+			in_rport_context = 1;
+		} else
+			in_rport_context = 0;
 	}
-	fclose(rfp);
+	pclose(rfp);
+
 fail:
 	if (!num && compat)
 		fprintf(fp, "---");