Hello community, here is the log from the commit of package open-lldp for openSUSE:Factory checked in at 2020-12-13 17:29:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-lldp (Old) and /work/SRC/openSUSE:Factory/.open-lldp.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-lldp" Sun Dec 13 17:29:21 2020 rev:18 rq:854713 version:1.1+18.0e969d0edcc4 Changes: -------- --- /work/SRC/openSUSE:Factory/open-lldp/open-lldp.changes 2020-11-13 18:56:09.361914725 +0100 +++ /work/SRC/openSUSE:Factory/.open-lldp.new.2328/open-lldp.changes 2020-12-13 17:29:23.128327990 +0100 @@ -1,0 +2,6 @@ +Thu Dec 10 22:40:33 UTC 2020 - ldun...@suse.com + +- Update to version v1.1+18.0e969d0edcc4: + * event_iface: only set rcv buf size if too small (bsc#1175570) + +------------------------------------------------------------------- Old: ---- open-lldp-v1.1+15.ef8495548d04.tar.xz New: ---- open-lldp-v1.1+18.0e969d0edcc4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-lldp.spec ++++++ --- /var/tmp/diff_new_pack.avudU3/_old 2020-12-13 17:29:23.704328574 +0100 +++ /var/tmp/diff_new_pack.avudU3/_new 2020-12-13 17:29:23.708328578 +0100 @@ -21,7 +21,7 @@ Summary: Link Layer Discovery Protocol (LLDP) Agent License: GPL-2.0-only Group: System/Daemons -Version: 1.1+15.ef8495548d04 +Version: 1.1+18.0e969d0edcc4 Release: 0 BuildRequires: bison BuildRequires: flex ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.avudU3/_old 2020-12-13 17:29:23.744328615 +0100 +++ /var/tmp/diff_new_pack.avudU3/_new 2020-12-13 17:29:23.748328618 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/lldpad.git</param> - <param name="changesrevision">ef8495548d0490238c2cb727800a9e08e2510280</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">0e969d0edcc41444b18fc579535516218421c388</param></service></servicedata> \ No newline at end of file ++++++ open-lldp-v1.1+15.ef8495548d04.tar.xz -> open-lldp-v1.1+18.0e969d0edcc4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-lldp-v1.1+15.ef8495548d04/event_iface.c new/open-lldp-v1.1+18.0e969d0edcc4/event_iface.c --- old/open-lldp-v1.1+15.ef8495548d04/event_iface.c 2020-11-09 18:24:37.000000000 +0100 +++ new/open-lldp-v1.1+18.0e969d0edcc4/event_iface.c 2020-12-10 23:40:08.000000000 +0100 @@ -418,7 +418,8 @@ 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); @@ -426,10 +427,18 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-lldp-v1.1+15.ef8495548d04/include/qbg_vdpnl.h new/open-lldp-v1.1+18.0e969d0edcc4/include/qbg_vdpnl.h --- old/open-lldp-v1.1+15.ef8495548d04/include/qbg_vdpnl.h 2020-11-09 18:24:37.000000000 +0100 +++ new/open-lldp-v1.1+18.0e969d0edcc4/include/qbg_vdpnl.h 2020-12-10 23:40:08.000000000 +0100 @@ -33,6 +33,7 @@ #include <linux/if_ether.h> #define MAX_PAYLOAD 4096 /* Maximum Payload Size */ +#define MIN_RCVBUF_SIZE (MAX_PAYLOAD << 5) /* SO_RCVBUF min */ enum { vdpnl_nlf1 = 1, /* Netlink message format 1 (draft 0.2) */ _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org