Merge pull request #2985 from keszybz/lldp-assert
Replace if with assert_cc in lldp code and a build-sys tweak
This commit is contained in:
commit
710a8858a9
|
@ -1383,6 +1383,9 @@ pkgconfigdata_DATA += \
|
||||||
nodist_rpmmacros_DATA = \
|
nodist_rpmmacros_DATA = \
|
||||||
src/core/macros.systemd
|
src/core/macros.systemd
|
||||||
|
|
||||||
|
BUILT_SOURCES += \
|
||||||
|
src/core/triggers.systemd
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
src/core/systemd.pc.in \
|
src/core/systemd.pc.in \
|
||||||
src/core/macros.systemd.in \
|
src/core/macros.systemd.in \
|
||||||
|
|
|
@ -239,9 +239,8 @@ static int link_send_lldp(Link *link) {
|
||||||
(void) gethostname_strict(&hostname);
|
(void) gethostname_strict(&hostname);
|
||||||
(void) parse_env_file("/etc/machine-info", NEWLINE, "PRETTY_HOSTNAME", &pretty_hostname, NULL);
|
(void) parse_env_file("/etc/machine-info", NEWLINE, "PRETTY_HOSTNAME", &pretty_hostname, NULL);
|
||||||
|
|
||||||
|
assert_cc(LLDP_TX_INTERVAL_USEC * LLDP_TX_HOLD + 1 <= (UINT16_MAX - 1) * USEC_PER_SEC);
|
||||||
ttl = DIV_ROUND_UP(LLDP_TX_INTERVAL_USEC * LLDP_TX_HOLD + 1, USEC_PER_SEC);
|
ttl = DIV_ROUND_UP(LLDP_TX_INTERVAL_USEC * LLDP_TX_HOLD + 1, USEC_PER_SEC);
|
||||||
if (ttl > (usec_t) UINT16_MAX)
|
|
||||||
ttl = (usec_t) UINT16_MAX;
|
|
||||||
|
|
||||||
caps = (link->network && link->network->ip_forward != ADDRESS_FAMILY_NO) ?
|
caps = (link->network && link->network->ip_forward != ADDRESS_FAMILY_NO) ?
|
||||||
SD_LLDP_SYSTEM_CAPABILITIES_ROUTER :
|
SD_LLDP_SYSTEM_CAPABILITIES_ROUTER :
|
||||||
|
|
Loading…
Reference in a new issue