From: Aaron Conole <aconole@redhat.com>

Date: Wed, 09 Jun 2021 15:12:06 +0000

Subject: [PATCH] lldpad: Rebase to openlldp branch 1.1.0

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Open-LLDP released 1.1.0 which includes a number of important fixes

relevant to customers.  The biggest changes are documented in the

changelog.

This patch updates the lldpad package to 1.1.0 branch as of

4c75fa274230 "tx: rename variable"

Signed-off-by: Aaron Conole <aconole@redhat.com>

---

 ChangeLog                  |   15 +++

 Makefile.am                |   26 +++++

 README                     |    4 

 config.c                   |   45 ++++++---

 configure.ac               |   39 ++++++++

 ctrl_iface.c               |    4 

 dcb_protocol.c             |   19 +---

 dcb_rule_chk.c             |    2 

 dcbtool.c                  |    2 

 dcbtool_cmds.c             |   24 -----

 docs/liblldp_clif-vdp22.3  |    2 

 docs/lldptool.8            |    4 

 event_iface.c              |   22 +++-

 include/config.h           |    3 

 include/linux/if_link.h    |  100 ++++++++++++++++++++-

 include/lldp.h             |   13 ++

 include/lldp_basman_clif.h |    6 -

 include/lldp_mod.h         |    2 

 include/lldp_tlv.h         |   16 ++-

 include/lldp_util.h        |    4 

 include/lldptool.h         |    3 

 include/qbg_ecp22.h        |    4 

 include/qbg_vdpnl.h        |    1 

 lldp/agent.c               |    4 

 lldp/l2_packet.h           |    7 -

 lldp/l2_packet_linux.c     |    6 -

 lldp/ports.c               |    2 

 lldp/rx.c                  |   41 ++++----

 lldp/states.h              |    2 

 lldp/tx.c                  |   31 ++++--

 lldp_8021qaz.c             |   52 ++++++-----

 lldp_8021qaz_clif.c        |   80 ++++++++++++-----

 lldp_8021qaz_cmds.c        |    2 

 lldp_8023.c                |   14 +--

 lldp_basman.c              |   10 --

 lldp_basman_cmds.c         |   90 +++++++++++++++++++

 lldp_dcbx.c                |  111 +++++++++---------------

 lldp_dcbx_cfg.c            |   32 ++++--

 lldp_dcbx_cmds.c           |   13 ++

 lldp_dcbx_nl.c             |   20 +---

 lldp_evb.c                 |    8 -

 lldp_evb22.c               |    8 -

 lldp_evb22_cmds.c          |    2 

 lldp_evb_cmds.c            |    2 

 lldp_mand.c                |   41 +++++---

 lldp_mand_cmds.c           |   17 ++-

 lldp_med.c                 |    8 -

 lldp_med_cmds.c            |    1 

 lldp_rtnl.c                |    3 

 lldp_tlv.c                 |   12 --

 lldp_util.c                |  206 +++++++++++++++++++++++++++++----------------

 lldpad.c                   |   21 +++-

 lldpad.service             |    2 

 lldpad.socket              |    3 

 lldpad.spec.in             |   36 +++++--

 lldptool.c                 |   38 ++------

 lldptool_cmds.c            |    3 

 log.c                      |    1 

 parse_cli.l                |    3 

 qbg/ecp.c                  |    8 -

 qbg/ecp22.c                |   21 +++-

 qbg/vdp.c                  |   16 +--

 qbg/vdp22.c                |   12 +-

 qbg/vdp22_cmds.c           |    7 -

 qbg/vdp22sm.c              |    4 

 qbg/vdp_cmds.c             |    2 

 qbg/vdpnl.c                |    8 -

 qbg_utils.c                |    3 

 tlv_dcbx.c                 |   33 ++++---

 vdptool.c                  |   23 ++---

 vdptool_cisco_oui.c        |    2 

 weak_readline.c            |   16 ++-

 72 files changed, 935 insertions(+), 512 deletions(-)

diff -upr a/ChangeLog b/ChangeLog

--- a/ChangeLog	2015-01-20 13:42:56.000000000 -0500

+++ b/ChangeLog	2021-06-09 11:00:02.478019444 -0400

@@ -1,3 +1,18 @@

+Changes from 1.1.0 to

+Changes from 1.0.1 to 1.1

+- VDP: introduce vdptool

+- VDP: support retrieving vsi parameter

+- VDP: TLV support

+- VDP: Support OUI infrastructure

+- Switch from SysV to posix shared memory

+- DCBX: ignore PG configurations

+- DCBX: Allow for read-only LLDP configuration

+- Support multicast MAC

+- autoconf: Suport systemd or sysv for init system

+- 802.1qaz: print prio map

+- lldptool: Allow to modify optional TLV content

+- CVE-2018-10932: Don't print raw bytes from mngAddr

+- Misc. bug fixes

 Changes from 0.9.46 to 1.0.1

   Mostly fixes and man page updates

   Added more testing infrastructure mostly for EVB

diff -upr a/config.c b/config.c

--- a/config.c	2015-01-20 13:42:56.000000000 -0500

+++ b/config.c	2020-10-23 14:12:58.973289274 -0400

@@ -56,6 +56,21 @@

 config_t lldpad_cfg;

 /*

+ * config_ifkey - Generates a config key

+ *

+ * Given an interface name this functions generates

+ * a key (based on interface's index) suitable

+ * to pass to libconfig.

+ *

+ */

+void config_ifkey(const char *name, char *ifkey) {

+	int index = if_nametoindex(name);

+	

+	if(index)

+		sprintf(ifkey, "if%d", index);

+}

+

+/*

  * init_cfg - initialze the global lldpad_cfg via config_init

  *

  * Returns true (1) for succes and false (0) for failed

@@ -170,7 +185,7 @@ void scan_port(UNUSED void *eloop_data,

 		LIST_FOREACH(agent, &port->agent_head, entry) {

 			LLDPAD_DBG("%s: calling ifdown for agent %p.\n",

 				   __func__, agent);

-			LIST_FOREACH(np, &lldp_head, lldp) {

+			LIST_FOREACH(np, &lldp_mod_head, lldp) {

 				ops = np->ops;

 				if (ops->lldp_mod_ifdown)

 					ops->lldp_mod_ifdown(ifname, agent);

@@ -219,7 +234,7 @@ int check_cfg_file(void)

 			}

 		} else {

 			retval = errno;

-			LLDPAD_ERR("%s is not readable and writeable",

+			LLDPAD_ERR("%s is not readable and writeable\n",

 				cfg_file_name);

 		}

 	}

@@ -295,7 +310,7 @@ int get_int_config(config_setting_t *s,

 	}

 	if (!rval)

-		LLDPAD_ERR("invalid value for %s", attr);

+		LLDPAD_ERR("invalid value for %s\n", attr);

 	return rval;

 }

@@ -339,7 +354,7 @@ int get_array_config(config_setting_t *s

 	}

 	if (!rval)

-		LLDPAD_ERR("invalid setting for %s", attr);

+		LLDPAD_ERR("invalid setting for %s\n", attr);

 	return rval;

 }

@@ -379,7 +394,7 @@ void init_ports(void)

 		LIST_FOREACH(agent, &port->agent_head, entry) {

 			LLDPAD_DBG("%s: calling ifup for agent %p.\n",

 				   __func__, agent);

-			LIST_FOREACH(np, &lldp_head, lldp) {

+			LIST_FOREACH(np, &lldp_mod_head, lldp) {

 				if (np->ops->lldp_mod_ifup)

 					np->ops->lldp_mod_ifup(p->if_name, agent);

 			}

@@ -451,14 +466,15 @@ static int lookup_config_value(char *pat

 int get_config_setting(const char *ifname, int agenttype, char *path,

 		       union cfg_get v, int type)

 {

-	char p[1024];

+	char p[1024], ifkey[IFNAMSIZ];

 	int rval = CONFIG_FALSE;

 	const char *section = agent_type2section(agenttype);

 	/* look for setting in section->ifname area first */

 	if (ifname) {

+		config_ifkey(ifname, ifkey);

 		snprintf(p, sizeof(p), "%s.%s.%s",

-			 section, ifname, path);

+			 section, ifkey, path);

 		rval = lookup_config_value(p, v, type);

 	}

@@ -475,15 +491,16 @@ int get_config_setting(const char *ifnam

 int remove_config_setting(const char *ifname, int agenttype, char *parent,

 			  char *name)

 {

-	char p[1024];

+	char p[1024], ifkey[IFNAMSIZ];

 	int rval = CONFIG_FALSE;

 	config_setting_t *setting = NULL;

 	const char *section = agent_type2section(agenttype);

 	/* look for setting in section->ifname area first */

-	if (ifname) {

+	if (ifname) { 

+		config_ifkey(ifname, ifkey);

 		snprintf(p, sizeof(p), "%s.%s.%s",

-			 section, ifname, parent);

+			 section, ifkey, parent);

 		setting = config_lookup(&lldpad_cfg, p);

 	}

@@ -570,15 +587,17 @@ int set_config_setting(const char *ifnam

 		       union cfg_set v, int type)

 {

 	config_setting_t *setting = NULL;

-	char p[1024];

+	char p[1024], ifkey[IFNAMSIZ];

 	int rval = cmd_success;

 	const char *section = agent_type2section(agenttype);

 	LLDPAD_DBG("%s(%i): \n", __func__, __LINE__);

-	if (strlen(ifname))

+	if (strlen(ifname)){

+		config_ifkey(ifname, ifkey);

 		snprintf(p, sizeof(p), "%s.%s.%s",

-			 section, ifname, path);

+			 section, ifkey, path);

+	}

 	else

 		snprintf(p, sizeof(p), "%s.%s.%s",

 			 section, LLDP_COMMON, path);

diff -upr a/configure.ac b/configure.ac

--- a/configure.ac	2015-01-20 13:42:56.000000000 -0500

+++ b/configure.ac	2021-06-09 11:00:02.479019457 -0400

@@ -1,4 +1,4 @@

-AC_INIT([lldpad], [1.0.1], [lldp-devel@open-lldp.org])

+AC_INIT([lldpad], [1.1.0], [lldp-devel@open-lldp.org])

 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])

 m4_pattern_allow([AM_PROG_AR])

@@ -25,6 +25,43 @@ then

  AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.])

 fi

+dnl Begin determine the systemd use and location

+PKG_CHECK_MODULES([SYSTEMD], [systemd], use_systemd=yes, use_systemd=no)

+

+dnl Configure developer type flags

+OPENLLDP_CHECK_WARNINGS

+OPENLLDP_CHECK_ERROR

+

+dnl Set sysvinit values, if system has systemd it will be rewritten

+AC_SUBST(SPEC_BUILD_REQUIRES_POST, "chkconfig")

+AC_SUBST(SPEC_BUILD_REQUIRES_PREUN, "chkconfig initscripts")

+AC_SUBST(SPEC_BUILD_REQUIRES_POSTUN, "initscripts")

+specfile_install="%{_sysconfdir}/init.d/lldpad"

+specfile_install_socket=""

+

+if test "x$use_systemd" == xyes; then

+        dir=""

+        AC_ARG_WITH([systemdsystemunitdir],

+                AS_HELP_STRING([--with-systemdsystem unitdir=DIR],

+                 [Directory for systemd service files default from pkg-config variable systemdsystemunitdir]),

+                [dir=${withval}],

+                [dir="$($PKG_CONFIG --variable=systemdsystemunitdir systemd)"])

+

+	systemdsystemunitdir=${dir}

+	AC_SUBST(SYSTEMD_SYSTEM_UNIT_DIR, [$systemdsystemunitdir])

+	specfile_install="$systemdsystemunitdir/lldpad.service"	

+	specfile_install_socket="$systemdsystemunitdir/lldpad.socket"

+

+	AC_SUBST(SPEC_BUILD_REQUIRES_POST, "systemd")

+	AC_SUBST(SPEC_BUILD_REQUIRES_PREUN, "systemd")

+	AC_SUBST(SPEC_BUILD_REQUIRES_POSTUN, "systemd")

+fi

+

+AM_CONDITIONAL(SYSTEMD_SYSTEM, test "x$use_systemd" == xyes)

+AC_SUBST(SPEC_FILE_LLDPAD_SERVICE, $specfile_install)

+AC_SUBST(SPEC_FILE_LLDPAD_SOCKET, $specfile_install_socket)

+dnl End systemd stuff

+

 PKG_CHECK_MODULES([LIBCONFIG], [libconfig >= 1.3.2])

 PKG_CHECK_MODULES([LIBNL], [libnl-3.0 >= 3.2])

diff -upr a/ctrl_iface.c b/ctrl_iface.c

--- a/ctrl_iface.c	2021-06-09 10:58:59.208200552 -0400

+++ b/ctrl_iface.c	2020-11-03 09:08:48.057229002 -0500

@@ -53,8 +53,6 @@

 #include "lldp_util.h"

 #include "messages.h"

-extern struct lldp_head lldp_head;

-

 struct ctrl_dst {

 	struct ctrl_dst *next;

 	struct sockaddr_un addr;

@@ -116,7 +114,7 @@ int clif_iface_module(struct clif_data *

 		return cmd_invalid;

 	}

-	mod = find_module_by_id(&lldp_head, module_id);

+	mod = find_module_by_id(&lldp_mod_head, module_id);

 	if (mod && mod->ops && mod->ops->client_cmd)

 		return  (mod->ops->client_cmd)(clifd, from, fromlen,

 			 cmd_start, cmd_len, rbuf+strlen(rbuf), rlen);

diff -upr a/dcb_protocol.c b/dcb_protocol.c

--- a/dcb_protocol.c	2015-01-20 13:42:56.000000000 -0500

+++ b/dcb_protocol.c	2020-09-23 08:50:52.647813847 -0400

@@ -75,7 +75,7 @@ void pg_insert(struct pghead *head, char

 	entry = (struct pg_store1 *)malloc(sizeof(struct pg_store1));

 	if (!entry)

 		return;

-	strncpy(entry->ifname, ifname, sizeof(entry->ifname));

+	STRNCPY_TERMINATED(entry->ifname, ifname, sizeof(entry->ifname));

 	entry->second = store;

 	LIST_INSERT_HEAD(head, entry, entries);

 }

@@ -1100,7 +1100,7 @@ int dcbx_remove_adapter(char *device_nam

 	assert(device_name);

 	not_default = memcmp(DEF_CFG_STORE, device_name,

 		strlen(DEF_CFG_STORE));

-	strncpy (devName, device_name, MAX_DEVICE_NAME_LEN);

+	STRNCPY_TERMINATED (devName, device_name, MAX_DEVICE_NAME_LEN);

 	if (not_default)

 		handle_opermode_true(device_name);

@@ -2257,13 +2257,8 @@ cmd_status get_bwg_descrpt(char *device_

 	if ((it != NULL) &&

 		(bwgid < it->second->max_pgid_desc)) {

-		size = (int)strlen(it->second->pgid_desc[bwgid]) +

-			sizeof(char);  /* Localization OK */

-		*name = (char*)malloc(size);

-		if (*name != NULL) {

-			strncpy(*name, it->second->pgid_desc[bwgid],

-					size); /* Localization OK */

-		} else {

+		*name = strdup(it->second->pgid_desc[bwgid]);

+		if (*name == NULL) {

 			goto Error;

 		}

 	} else {

@@ -2272,11 +2267,9 @@ cmd_status get_bwg_descrpt(char *device_

 			size = (int)strlen(

 				attribs.descript.pgid_desc[bwgid]) +

 				sizeof(char);

-			*name = (char*)malloc(size);

+			*name = (char*)calloc(size, sizeof(char));

 			if (*name != NULL) {

-				strncpy(*name,

-					attribs.descript.pgid_desc[bwgid],

-					size); /* Localization OK */

+				memcpy(*name, attribs.descript.pgid_desc[bwgid], size - 1); /* Localization OK */

 			} else {

 				goto Error;

 			}

diff -upr a/dcb_rule_chk.c b/dcb_rule_chk.c

--- a/dcb_rule_chk.c	2015-01-20 13:42:56.000000000 -0500

+++ b/dcb_rule_chk.c	2020-09-23 08:50:52.647813847 -0400

@@ -206,6 +206,8 @@ static int dcb_fixup_pg(struct pg_attrib

 					strict = 0;

 				if (be == cbe)

 					be = 0;

+				if (pgid < 0)

+					continue;

 			}

 			if (pg_done[i] == false) {

diff -upr a/dcbtool.c b/dcbtool.c

--- a/dcbtool.c	2015-01-20 13:42:56.000000000 -0500

+++ b/dcbtool.c	2020-09-23 08:50:52.647813847 -0400

@@ -47,6 +47,7 @@

 #define UNUSED __attribute__((__unused__))

 static int show_raw;

+extern void close_history(void);

 static const char *cli_version =

 "dcbtool v" DCBTOOL_VERSION "\n"

@@ -460,6 +461,7 @@ static void cli_interactive(int raw)

 			request(clif_conn, argc, argv, raw);

 		free(cmd);

 	} while (!cli_quit);

+	close_history();

 }

 static void cli_terminate(UNUSED int sig)

diff -upr a/dcbtool_cmds.c b/dcbtool_cmds.c

--- a/dcbtool_cmds.c	2015-01-20 13:42:56.000000000 -0500

+++ b/dcbtool_cmds.c	2020-09-23 08:50:52.647813847 -0400

@@ -27,6 +27,7 @@

 #include <stdlib.h>

 #include <stdio.h>

 #include <ctype.h>

+#include <sys/types.h>

 #include "clif.h"

 #include "dcbtool.h"

 #include "lldp_dcbx_cmds.h"

@@ -38,7 +39,6 @@

 static char *print_status(cmd_status status);

 static char *get_pgdesc_args(int cmd);

-static int hex2int(char *b);

 static void free_cmd_args(char *args);

 static char *get_dcb_args(void);

 static char *get_dcbx_args(void);

@@ -93,28 +93,6 @@ static char *print_status(cmd_status sta

 	return str;

 }

-/* assumes input is pointer to two hex digits */

-/* returns -1 on error */

-static int hex2int(char *b)

-{

-	int i;

-	int n=0;

-	int m;

-	

-	for (i=0,m=1; i<2; i++,m--) {

-		if (isxdigit(*(b+i))) {

-			if (*(b+i) <= '9')

-				n |= (*(b+i) & 0x0f) << (4*m);

-			else

-				n |= ((*(b+i) & 0x0f) + 9) << (4*m);

-		}

-		else {

-			return -1;

-		}

-	}

-	return n;

-}

-

 static char *get_dcb_args(void)

 {

 	char buf[8];

diff -upr a/docs/liblldp_clif-vdp22.3 b/docs/liblldp_clif-vdp22.3

--- a/docs/liblldp_clif-vdp22.3	2015-01-20 13:42:56.000000000 -0500

+++ b/docs/liblldp_clif-vdp22.3	2020-11-03 09:08:48.058229019 -0500

@@ -1,6 +1,6 @@

 .TH liblldp_clif 3 "February 2014" "open-lldp" "Linux"

 .SH NAME

-clif_vsi,clif_vsievt,clif_vsiwait \- Manipulate VDP IEEE 802.1 Ratified Standard Assocications

+clif_vsi,clif_vsievt,clif_vsiwait \- Manipulate VDP IEEE 802.1 Ratified Standard Associations

 .SH SYNOPSIS

 #include "include/clif.h"

 .sp 1

diff -upr a/docs/lldptool.8 b/docs/lldptool.8

--- a/docs/lldptool.8	2015-01-20 13:42:56.000000000 -0500

+++ b/docs/lldptool.8	2020-11-03 09:08:48.058229019 -0500

@@ -160,9 +160,9 @@ Query the LLDP adminStatus for interface

 .TP

 Query the LLDP statistics for interface \fIeth3\fR

-.B lldptool -S -i eth3 adminStatus

+.B lldptool -S -i eth3

 .br

-.B lldptool stats -i eth3 adminStatus

+.B lldptool stats -i eth3

 .TP

 Query the local TLVs which are being transmitted for a given interface:

diff -upr a/event_iface.c b/event_iface.c

--- a/event_iface.c	2015-01-20 13:42:56.000000000 -0500

+++ b/event_iface.c	2021-01-06 11:05:30.808649405 -0500

@@ -77,7 +77,7 @@ static void event_if_decode_rta(int type

 		LLDPAD_DBG(" IFLA_BROADCAST\n");

 		break;

 	case IFLA_IFNAME:

-		strncpy(d, (char *)RTA_DATA(rta), IFNAMSIZ);

+		STRNCPY_TERMINATED(d, (char *)RTA_DATA(rta), IFNAMSIZ);

 		LLDPAD_DBG(" IFLA_IFNAME\n");

 		LLDPAD_DBG("        device name is %s\n", d);

 		break;

@@ -205,6 +205,9 @@ int oper_add_device(char *device_name)

 		port = newport;

 	} else if (is_bond(device_name) || !port->portEnabled)

 		reinit_port(device_name);

+	else if (port->portEnabled) {

+		return 0;

+	}

 	lldp_add_agent(device_name, NEAREST_BRIDGE);

 	lldp_add_agent(device_name, NEAREST_NONTPMR_BRIDGE);

@@ -213,7 +216,7 @@ int oper_add_device(char *device_name)

 	LIST_FOREACH(agent, &port->agent_head, entry) {

 		LLDPAD_DBG("%s: calling ifup for agent %p.\n",

 			   __func__, agent);

-		LIST_FOREACH(np, &lldp_head, lldp) {

+		LIST_FOREACH(np, &lldp_mod_head, lldp) {

 			if (np->ops->lldp_mod_ifup)

 				np->ops->lldp_mod_ifup(device_name, agent);

 		}

@@ -280,7 +283,7 @@ static void event_if_decode_nlmsg(int ro

 			LIST_FOREACH(agent, &port->agent_head, entry) {

 				LLDPAD_DBG("%s: calling ifdown for agent %p.\n",

 					   __func__, agent);

-				LIST_FOREACH(np, &lldp_head, lldp) {

+				LIST_FOREACH(np, &lldp_mod_head, lldp) {

 					ops = np->ops;

 					if (ops->lldp_mod_ifdown)

 						ops->lldp_mod_ifdown(device_name,

@@ -415,7 +418,8 @@ event_iface_receive(int sock, UNUSED voi

 int event_iface_init()

 {

 	int fd;

-	int rcv_size = MAX_PAYLOAD;

+	int rcv_size = 0;

+	socklen_t rcv_len = sizeof(int);

 	struct sockaddr_nl snl;

 	fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);

@@ -423,10 +427,18 @@ int event_iface_init()

 	if (fd < 0)

 		return fd;

-	if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcv_size, sizeof(int)) < 0) {

+	/* is receive buffer size too small? */

+	if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcv_size, &rcv_len) < 0) {

 		close(fd);

 		return -EIO;

 	}

+	if (rcv_size < MIN_RCVBUF_SIZE) {

+		rcv_size = MIN_RCVBUF_SIZE >> 1;	/* we get back 2x what we set */

+		if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcv_size, rcv_len) < 0) {

+			close(fd);

+			return -EIO;

+		}

+	}

 	memset((void *)&snl, 0, sizeof(struct sockaddr_nl));

 	snl.nl_family = AF_NETLINK;

diff -upr a/include/config.h b/include/config.h

--- a/include/config.h	2015-01-20 13:42:56.000000000 -0500

+++ b/include/config.h	2020-09-23 08:50:52.647813847 -0400

@@ -111,4 +111,7 @@ void destroy_cfg(void);

 int check_cfg_file(void);

 int check_for_old_file_format(void);

 void init_ports(void);

+

+void config_ifkey(const char *name, char *ifkey);

+

 #endif /* _CONFIG_H_ */

diff -upr a/include/linux/if_link.h b/include/linux/if_link.h

--- a/include/linux/if_link.h	2015-01-20 13:42:56.000000000 -0500

+++ b/include/linux/if_link.h	2020-09-23 08:50:52.648813865 -0400

@@ -116,15 +116,34 @@ enum {

 	IFLA_STATS64,

 	IFLA_VF_PORTS,

 	IFLA_PORT_SELF,

-        IFLA_AF_SPEC,

-        IFLA_GROUP,             /* Group the device belongs to */

-        IFLA_NET_NS_FD,

-        IFLA_EXT_MASK,          /* Extended info mask, VFs, etc */

-        IFLA_PROMISCUITY,       /* Promiscuity count: > 0 means acts PROMISC */

+	IFLA_AF_SPEC,

+	IFLA_GROUP,		/* Group the device belongs to */

+	IFLA_NET_NS_FD,

+	IFLA_EXT_MASK,		/* Extended info mask, VFs, etc */

+	IFLA_PROMISCUITY,	/* Promiscuity count: > 0 means acts PROMISC */

 #define IFLA_PROMISCUITY IFLA_PROMISCUITY

-        IFLA_NUM_TX_QUEUES,

-        IFLA_NUM_RX_QUEUES,

-        IFLA_CARRIER,

+	IFLA_NUM_TX_QUEUES,

+	IFLA_NUM_RX_QUEUES,

+	IFLA_CARRIER,

+	IFLA_PHYS_PORT_ID,

+	IFLA_CARRIER_CHANGES,

+	IFLA_PHYS_SWITCH_ID,

+	IFLA_LINK_NETNSID,

+	IFLA_PHYS_PORT_NAME,

+	IFLA_PROTO_DOWN,

+	IFLA_GSO_MAX_SEGS,

+	IFLA_GSO_MAX_SIZE,

+	IFLA_PAD,

+	IFLA_XDP,

+	IFLA_EVENT,

+	IFLA_NEW_NETNSID,

+	IFLA_IF_NETNSID,

+	IFLA_TARGET_NETNSID = IFLA_IF_NETNSID, /* new alias */

+	IFLA_CARRIER_UP_COUNT,

+	IFLA_CARRIER_DOWN_COUNT,

+	IFLA_NEW_IFINDEX,

+	IFLA_MIN_MTU,

+	IFLA_MAX_MTU,

 	__IFLA_MAX

 };

@@ -192,6 +211,8 @@ enum {

 	IFLA_INFO_KIND,

 	IFLA_INFO_DATA,

 	IFLA_INFO_XSTATS,

+	IFLA_INFO_SLAVE_KIND,

+	IFLA_INFO_SLAVE_DATA,

 	__IFLA_INFO_MAX,

 };

@@ -243,6 +264,69 @@ enum macvlan_mode {

 	MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */

 };

+/* Bonding section */

+

+enum {

+	IFLA_BOND_UNSPEC,

+	IFLA_BOND_MODE,

+	IFLA_BOND_ACTIVE_SLAVE,

+	IFLA_BOND_MIIMON,

+	IFLA_BOND_UPDELAY,

+	IFLA_BOND_DOWNDELAY,

+	IFLA_BOND_USE_CARRIER,

+	IFLA_BOND_ARP_INTERVAL,

+	IFLA_BOND_ARP_IP_TARGET,

+	IFLA_BOND_ARP_VALIDATE,

+	IFLA_BOND_ARP_ALL_TARGETS,

+	IFLA_BOND_PRIMARY,

+	IFLA_BOND_PRIMARY_RESELECT,

+	IFLA_BOND_FAIL_OVER_MAC,

+	IFLA_BOND_XMIT_HASH_POLICY,

+	IFLA_BOND_RESEND_IGMP,

+	IFLA_BOND_NUM_PEER_NOTIF,

+	IFLA_BOND_ALL_SLAVES_ACTIVE,

+	IFLA_BOND_MIN_LINKS,

+	IFLA_BOND_LP_INTERVAL,

+	IFLA_BOND_PACKETS_PER_SLAVE,

+	IFLA_BOND_AD_LACP_RATE,

+	IFLA_BOND_AD_SELECT,

+	IFLA_BOND_AD_INFO,

+	IFLA_BOND_AD_ACTOR_SYS_PRIO,

+	IFLA_BOND_AD_USER_PORT_KEY,

+	IFLA_BOND_AD_ACTOR_SYSTEM,

+	IFLA_BOND_TLB_DYNAMIC_LB,

+	__IFLA_BOND_MAX,

+};

+

+#define IFLA_BOND_MAX	(__IFLA_BOND_MAX - 1)

+

+enum {

+	IFLA_BOND_AD_INFO_UNSPEC,

+	IFLA_BOND_AD_INFO_AGGREGATOR,

+	IFLA_BOND_AD_INFO_NUM_PORTS,

+	IFLA_BOND_AD_INFO_ACTOR_KEY,

+	IFLA_BOND_AD_INFO_PARTNER_KEY,

+	IFLA_BOND_AD_INFO_PARTNER_MAC,

+	__IFLA_BOND_AD_INFO_MAX,

+};

+

+#define IFLA_BOND_AD_INFO_MAX	(__IFLA_BOND_AD_INFO_MAX - 1)

+

+enum {

+	IFLA_BOND_SLAVE_UNSPEC,

+	IFLA_BOND_SLAVE_STATE,

+	IFLA_BOND_SLAVE_MII_STATUS,

+	IFLA_BOND_SLAVE_LINK_FAILURE_COUNT,

+	IFLA_BOND_SLAVE_PERM_HWADDR,

+	IFLA_BOND_SLAVE_QUEUE_ID,

+	IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,

+	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,

+	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,

+	__IFLA_BOND_SLAVE_MAX,

+};

+

+#define IFLA_BOND_SLAVE_MAX	(__IFLA_BOND_SLAVE_MAX - 1)

+

 /* SR-IOV virtual function management section */

 enum {

diff -upr a/include/lldp_basman_clif.h b/include/lldp_basman_clif.h

--- a/include/lldp_basman_clif.h	2015-01-20 13:42:56.000000000 -0500

+++ b/include/lldp_basman_clif.h	2020-09-23 08:50:52.648813865 -0400

@@ -31,7 +31,7 @@ struct lldp_module *basman_cli_register(

 void basman_cli_unregister(struct lldp_module *);

 int basman_print_tlv(u32, u16, char *);

-#define ARG_IPV4_ADDR "ipv4"

-#define ARG_IPV6_ADDR "ipv6"

-

+#define ARG_IPV4_ADDR	"ipv4"

+#define ARG_IPV6_ADDR	"ipv6"

+#define ARG_TLVINFO	"info"

 #endif

diff -upr a/include/lldp.h b/include/lldp.h

--- a/include/lldp.h	2015-01-20 13:42:56.000000000 -0500

+++ b/include/lldp.h	2020-09-23 08:50:52.648813865 -0400

@@ -51,6 +51,13 @@ typedef __u64 u64;

 		__x > __y ? __x : __y;	\

 	 })

+/* Use strncpy with N-1 and ensure the string is terminated.  */

+#define STRNCPY_TERMINATED(DEST, SRC, N) \

+  do { \

+    strncpy (DEST, SRC, N - 1); \

+    DEST[N - 1] = '\0'; \

+  } while (false)

+

 /*

  * Organizationally Unique Identifier (OUI)

  * http://standards.ieee.org/regauth/oui/oui.txt

@@ -248,5 +255,11 @@ enum {

 #define LLDP_EVB_DEFAULT_RTE				15

 #define LLDP_EVB_DEFAULT_MAX_RTE			31

+#ifndef _MSC_VER

+#define STRUCT_PACKED(STRUCT) STRUCT __attribute__((__packed__))

+#else

+#define STRUCT_PACKED(STRUCT) __pragma(pack(push, 1)) STRUCT __pragma(pack(pop))

+#endif

+

 void somethingChangedLocal(const char *ifname, int type);