Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package open-lldp for openSUSE:Factory
checked in at 2022-10-28 19:28:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-lldp (Old)
and /work/SRC/openSUSE:Factory/.open-lldp.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-lldp"
Fri Oct 28 19:28:53 2022 rev:21 rq:1031410 version:1.1+58.8ca361bab766
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-lldp/open-lldp.changes 2021-09-25
00:34:47.447091576 +0200
+++ /work/SRC/openSUSE:Factory/.open-lldp.new.2275/open-lldp.changes
2022-10-28 19:28:55.942451411 +0200
@@ -1,0 +2,12 @@
+Wed Oct 26 18:58:43 UTC 2022 - ldun...@suse.com
+
+- Update to version v1.1+58.8ca361bab766:
+ * clif: Include string.h for mem* function prototypes
+ * basman: use return address when pulling address
+ * Revert "Use interface index instead of name in libconfig"
+ * 8021Qaz: check for rx block validity
+ * 8021qaz: squelch initialization errors
+ * macvtap: fix error condition
+ * vdp22: convert command parsing to null term
+
+-------------------------------------------------------------------
Old:
----
open-lldp-v1.1+44.0f781b4162d3.tar.xz
New:
----
open-lldp-v1.1+58.8ca361bab766.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-lldp.spec ++++++
--- /var/tmp/diff_new_pack.LHlOi0/_old 2022-10-28 19:28:56.418453798 +0200
+++ /var/tmp/diff_new_pack.LHlOi0/_new 2022-10-28 19:28:56.426453838 +0200
@@ -1,7 +1,7 @@
#
# spec file for package open-lldp
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Summary: Link Layer Discovery Protocol (LLDP) Agent
License: GPL-2.0-only
Group: System/Daemons
-Version: 1.1+44.0f781b4162d3
+Version: 1.1+58.8ca361bab766
Release: 0
BuildRequires: bison
BuildRequires: flex
++++++ _service ++++++
--- /var/tmp/diff_new_pack.LHlOi0/_old 2022-10-28 19:28:56.470454059 +0200
+++ /var/tmp/diff_new_pack.LHlOi0/_new 2022-10-28 19:28:56.478454099 +0200
@@ -4,7 +4,7 @@
<param name="url">https://github.com/openSUSE/lldpad.git</param>
<param name="subdir"></param>
<param name="filename">open-lldp</param>
- <param name="version">0f781b4162d3</param>
+ <param name="version">8ca361bab766</param>
<param name="versionformat">v1.1+@TAG_OFFSET@.%h</param>
<param name="match-tag">v1.[0-9]</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.LHlOi0/_old 2022-10-28 19:28:56.502454219 +0200
+++ /var/tmp/diff_new_pack.LHlOi0/_new 2022-10-28 19:28:56.506454239 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/lldpad.git</param>
- <param
name="changesrevision">9e8d48d5cb03f76173d89d3b6b9b9c20beefd6e5</param></service></servicedata>
+ <param
name="changesrevision">8ca361bab7668aaa0ef54cba87a163e6e373f2ac</param></service></servicedata>
(No newline at EOF)
++++++ open-lldp-v1.1+44.0f781b4162d3.tar.xz ->
open-lldp-v1.1+58.8ca361bab766.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/.gitignore
new/open-lldp-v1.1+58.8ca361bab766/.gitignore
--- old/open-lldp-v1.1+44.0f781b4162d3/.gitignore 1970-01-01
01:00:00.000000000 +0100
+++ new/open-lldp-v1.1+58.8ca361bab766/.gitignore 2022-10-26
20:56:09.000000000 +0200
@@ -0,0 +1,40 @@
+*/.dirstamp
+compile
+parse_cli.c
+*.o
+*.lo
+*.tab.c
+.deps/
+.libs/
+.pc/
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+autoscan.log
+config.guess
+config.log
+config.status
+config.sub
+configure
+configure.scan
+depcomp
+include/version.h
+install-sh
+liblldp_clif.*
+libtool
+lldpad.pc
+lldpad.spec
+ltmain.sh
+m4/
+missing
+dcbtool
+lldpad
+lldptool
+vdptool
+nltest
+vdptest
+qbg22sim
+patches/
+tags
+ar-lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/clif.c
new/open-lldp-v1.1+58.8ca361bab766/clif.c
--- old/open-lldp-v1.1+44.0f781b4162d3/clif.c 2021-09-20 17:58:23.000000000
+0200
+++ new/open-lldp-v1.1+58.8ca361bab766/clif.c 2022-10-26 20:56:09.000000000
+0200
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/config.c
new/open-lldp-v1.1+58.8ca361bab766/config.c
--- old/open-lldp-v1.1+44.0f781b4162d3/config.c 2021-09-20 17:58:23.000000000
+0200
+++ new/open-lldp-v1.1+58.8ca361bab766/config.c 2022-10-26 20:56:09.000000000
+0200
@@ -56,21 +56,6 @@
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
@@ -466,15 +451,14 @@
int get_config_setting(const char *ifname, int agenttype, char *path,
union cfg_get v, int type)
{
- char p[1024], ifkey[IFNAMSIZ];
+ char p[1024];
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, ifkey, path);
+ section, ifname, path);
rval = lookup_config_value(p, v, type);
}
@@ -491,16 +475,15 @@
int remove_config_setting(const char *ifname, int agenttype, char *parent,
char *name)
{
- char p[1024], ifkey[IFNAMSIZ];
+ char p[1024];
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) {
- config_ifkey(ifname, ifkey);
+ if (ifname) {
snprintf(p, sizeof(p), "%s.%s.%s",
- section, ifkey, parent);
+ section, ifname, parent);
setting = config_lookup(&lldpad_cfg, p);
}
@@ -587,17 +570,15 @@
union cfg_set v, int type)
{
config_setting_t *setting = NULL;
- char p[1024], ifkey[IFNAMSIZ];
+ char p[1024];
int rval = cmd_success;
const char *section = agent_type2section(agenttype);
LLDPAD_DBG("%s(%i): \n", __func__, __LINE__);
- if (strlen(ifname)){
- config_ifkey(ifname, ifkey);
+ if (strlen(ifname))
snprintf(p, sizeof(p), "%s.%s.%s",
- section, ifkey, path);
- }
+ section, ifname, path);
else
snprintf(p, sizeof(p), "%s.%s.%s",
section, LLDP_COMMON, path);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/include/config.h
new/open-lldp-v1.1+58.8ca361bab766/include/config.h
--- old/open-lldp-v1.1+44.0f781b4162d3/include/config.h 2021-09-20
17:58:23.000000000 +0200
+++ new/open-lldp-v1.1+58.8ca361bab766/include/config.h 2022-10-26
20:56:09.000000000 +0200
@@ -111,7 +111,4 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/lldp_8021qaz.c
new/open-lldp-v1.1+58.8ca361bab766/lldp_8021qaz.c
--- old/open-lldp-v1.1+44.0f781b4162d3/lldp_8021qaz.c 2021-09-20
17:58:23.000000000 +0200
+++ new/open-lldp-v1.1+58.8ca361bab766/lldp_8021qaz.c 2022-10-26
20:56:09.000000000 +0200
@@ -1563,48 +1563,63 @@
/* Process */
switch (tlv->info[OUI_SIZE]) {
case IEEE8021QAZ_ETSCFG_TLV:
- if (tlvs->rx->etscfg == NULL) {
+ if (tlvs->rx && tlvs->rx->etscfg == NULL) {
tlvs->ieee8021qazdu |= RCVD_IEEE8021QAZ_TLV_ETSCFG;
tlvs->rx->etscfg = tlv;
- } else {
+ } else if (tlvs->rx) {
LLDPAD_WARN("%s: %s: 802.1Qaz Duplicate ETSCFG TLV\n",
__func__, port->ifname);
agent->rx.dupTlvs |= DUP_IEEE8021QAZ_TLV_ETSCFG;
return false;
+ } else {
+ LLDPAD_INFO("%s: %s: 802.1Qaz port IFDOWN\n",
+ __func__, port->ifname);
+ return false;
}
break;
case IEEE8021QAZ_ETSREC_TLV:
- if (tlvs->rx->etsrec == NULL) {
+ if (tlvs->rx && tlvs->rx->etsrec == NULL) {
tlvs->ieee8021qazdu |= RCVD_IEEE8021QAZ_TLV_ETSREC;
tlvs->rx->etsrec = tlv;
- } else {
+ } else if (tlvs->rx) {
LLDPAD_WARN("%s: %s: 802.1Qaz Duplicate ETSREC TLV\n",
__func__, port->ifname);
agent->rx.dupTlvs |= DUP_IEEE8021QAZ_TLV_ETSREC;
return false;
+ } else {
+ LLDPAD_INFO("%s: %s: 802.1Qaz port IFDOWN\n",
+ __func__, port->ifname);
+ return false;
}
break;
-
case IEEE8021QAZ_PFC_TLV:
- if (tlvs->rx->pfc == NULL) {
+ if (tlvs->rx && tlvs->rx->pfc == NULL) {
tlvs->ieee8021qazdu |= RCVD_IEEE8021QAZ_TLV_PFC;
tlvs->rx->pfc = tlv;
- } else {
+ } else if (tlvs->rx) {
LLDPAD_WARN("%s: %s: 802.1Qaz Duplicate PFC TLV\n",
__func__, port->ifname);
agent->rx.dupTlvs |= DUP_IEEE8021QAZ_TLV_PFC;
return false;
+ } else {
+ LLDPAD_INFO("%s: %s: 802.1Qaz port IFDOWN\n",
+ __func__, port->ifname);
+ return false;
}
break;
case IEEE8021QAZ_APP_TLV:
- if (tlvs->rx->app == NULL) {
+ if (tlvs->rx && tlvs->rx->app == NULL) {
tlvs->ieee8021qazdu |= RCVD_IEEE8021QAZ_TLV_APP;
tlvs->rx->app = tlv;
- } else {
+ } else if (tlvs->rx) {
LLDPAD_WARN("%s: %s: 802.1Qaz Duplicate APP TLV\n",
__func__, port->ifname);
agent->rx.dupTlvs |= DUP_IEEE8021QAZ_TLV_APP;
return false;
+ } else {
+ LLDPAD_INFO("%s: %s: 802.1Qaz port IFDOWN\n",
+ __func__, port->ifname);
+ return false;
}
break;
default:
@@ -1891,26 +1906,26 @@
tlvs = ieee8021qaz_data(port->ifname);
- if (tlvs->rx->etscfg) {
+ if (tlvs->rx && tlvs->rx->etscfg) {
process_ieee8021qaz_etscfg_tlv(port);
} else if (tlvs->ets->cfgr) {
free(tlvs->ets->cfgr);
tlvs->ets->cfgr = NULL;
}
- if (tlvs->rx->etsrec) {
+ if (tlvs->rx && tlvs->rx->etsrec) {
process_ieee8021qaz_etsrec_tlv(port);
} else if (tlvs->ets->recr) {
free(tlvs->ets->recr);
tlvs->ets->recr = NULL;
}
- if (tlvs->rx->pfc)
+ if (tlvs->rx && tlvs->rx->pfc)
process_ieee8021qaz_pfc_tlv(port);
else if (tlvs->pfc)
tlvs->pfc->remote_param = false;
- if (tlvs->rx->app)
+ if (tlvs->rx && tlvs->rx->app)
process_ieee8021qaz_app_tlv(port);
else
ieee8021qaz_app_reset(&tlvs->app_head);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/lldp_8021qaz_clif.c
new/open-lldp-v1.1+58.8ca361bab766/lldp_8021qaz_clif.c
--- old/open-lldp-v1.1+44.0f781b4162d3/lldp_8021qaz_clif.c 2021-09-20
17:58:23.000000000 +0200
+++ new/open-lldp-v1.1+58.8ca361bab766/lldp_8021qaz_clif.c 2022-10-26
20:56:09.000000000 +0200
@@ -253,7 +253,7 @@
{
u8 app, app_idx, app_prio, app_sel;
u16 proto, offset = 2;
- u8 dscp[MAX_USER_PRIORITIES][MAX_APP_ENTRIES];
+ u8 dscp[MAX_USER_PRIORITIES][MAX_APP_ENTRIES] = {0};
u8 dscp_count[MAX_USER_PRIORITIES] = {0};
u8 i, j;
bool first_app = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/lldp_basman.c
new/open-lldp-v1.1+58.8ca361bab766/lldp_basman.c
--- old/open-lldp-v1.1+44.0f781b4162d3/lldp_basman.c 2021-09-20
17:58:23.000000000 +0200
+++ new/open-lldp-v1.1+58.8ca361bab766/lldp_basman.c 2022-10-26
20:56:09.000000000 +0200
@@ -515,7 +515,7 @@
if (rc) {
rc = basman_get_manaddr_sub(bd, agent, MANADDR_IPV6);
if (rc)
- basman_get_manaddr_sub(bd, agent, MANADDR_ALL802);
+ rc = basman_get_manaddr_sub(bd, agent, MANADDR_ALL802);
}
out_err:
return rc;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/lldp_dcbx_cfg.c
new/open-lldp-v1.1+58.8ca361bab766/lldp_dcbx_cfg.c
--- old/open-lldp-v1.1+44.0f781b4162d3/lldp_dcbx_cfg.c 2021-09-20
17:58:23.000000000 +0200
+++ new/open-lldp-v1.1+58.8ca361bab766/lldp_dcbx_cfg.c 2022-10-26
20:56:09.000000000 +0200
@@ -99,15 +99,12 @@
config_setting_t *tmp2_setting = NULL;
char abuf[32];
int i;
- char device_name_sanitized[IFNAMSIZ];
dcbx_setting = config_lookup(&lldpad_cfg, DCBX_SETTING);
if (!dcbx_setting)
return NULL;
- config_ifkey(device_name, device_name_sanitized);
-
- eth_setting = config_setting_add(dcbx_setting, device_name_sanitized,
+ eth_setting = config_setting_add(dcbx_setting, device_name,
CONFIG_TYPE_GROUP);
if (!eth_setting)
goto set_error;
@@ -374,13 +371,11 @@
config_setting_t *setting_value = NULL;
char abuf[2*DCB_MAX_TLV_LENGTH + 1];
int result, i;
- char device_name_sanitized[IFNAMSIZ];
dcbx_setting = config_lookup(&lldpad_cfg, DCBX_SETTING);
- config_ifkey(device_name, device_name_sanitized);
if (dcbx_setting)
eth_settings = config_setting_get_member(dcbx_setting,
- device_name_sanitized);
+ device_name);
/* init the internal data store for device_name */
if (NULL == eth_settings) {
@@ -787,15 +782,13 @@
int result = cmd_failed, i;
int results[MAX_USER_PRIORITIES];
int len;
- char abuf[32], device_name_sanitized[IFNAMSIZ];
+ char abuf[32];
memset(attribs, 0, sizeof(*attribs));
dcbx_setting = config_lookup(&lldpad_cfg, DCBX_SETTING);
-
- config_ifkey(device_name, device_name_sanitized);
if (dcbx_setting)
- eth_settings = config_setting_get_member(dcbx_setting,
- device_name_sanitized);
+ eth_settings = config_setting_get_member(dcbx_setting,
+ device_name);
/* init the internal data store for device_name */
result = get_default_persistent(device_name, attribs);
@@ -1074,16 +1067,13 @@
int rc = EINVAL;
config_setting_t *settings = NULL;
char path[sizeof(DCBX_SETTING) + IFNAMSIZ + 16];
- char ifkey[IFNAMSIZ];
-
- config_ifkey(ifname, ifkey);
memset(path, 0, sizeof(path));
- snprintf(path, sizeof(path), "%s.%s.dcb_enable", DCBX_SETTING, ifkey);
+ snprintf(path, sizeof(path), "%s.%s.dcb_enable", DCBX_SETTING, ifname);
settings = config_lookup(&lldpad_cfg, path);
if (!settings) {
LLDPAD_INFO("### %s:%s:failed on %s\n", __func__, ifname, path);
- snprintf(path, sizeof(path), "%s.dcb_enable", ifkey);
+ snprintf(path, sizeof(path), "%s.dcb_enable", ifname);
settings = config_lookup(&lldpad_cfg, path);
if (!settings) {
LLDPAD_INFO("### %s:%s:failed again %s\n", __func__,
ifname, path);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/lldp_util.c
new/open-lldp-v1.1+58.8ca361bab766/lldp_util.c
--- old/open-lldp-v1.1+44.0f781b4162d3/lldp_util.c 2021-09-20
17:58:23.000000000 +0200
+++ new/open-lldp-v1.1+58.8ca361bab766/lldp_util.c 2022-10-26
20:56:09.000000000 +0200
@@ -681,7 +681,7 @@
s = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
if (s < 0) {
- goto out;
+ return false;
}
nlh = malloc(NLMSG_SIZE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-lldp-v1.1+44.0f781b4162d3/qbg/vdp22_cmds.c
new/open-lldp-v1.1+58.8ca361bab766/qbg/vdp22_cmds.c
--- old/open-lldp-v1.1+44.0f781b4162d3/qbg/vdp22_cmds.c 2021-09-20
17:58:23.000000000 +0200
+++ new/open-lldp-v1.1+58.8ca361bab766/qbg/vdp22_cmds.c 2022-10-26
20:56:09.000000000 +0200
@@ -577,7 +577,7 @@
memset(&vsi, 0, sizeof(vsi));
memset(vsi_str, 0, sizeof(vsi_str));
vsi.request = cmd->tlvid;
- strncpy(vsi.ifname, cmd->ifname, sizeof(vsi.ifname));
+ STRNCPY_TERMINATED(vsi.ifname, cmd->ifname, sizeof(vsi.ifname));
good_cmd = cmd_failed;
if ((cmd->ops & op_config) && (cmd->ops & op_arg)) {
memset(&mac, 0, sizeof(mac));
