X Tutup
Skip to content

Commit 6afa676

Browse files
bengalbengal
committed
lldp: move public macros to sd-lldp.h and namespace them
lldp.h contains definitions of LLDP types, subtypes and capabilities which should be exposed in public headers. Get rid of the file and move those definitions to sd-lldp.h with the SD_ prefix.
1 parent d8fd85e commit 6afa676

File tree

8 files changed

+132
-159
lines changed

8 files changed

+132
-159
lines changed

‎Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3423,7 +3423,6 @@ libsystemd_network_la_SOURCES = \
34233423
src/libsystemd-network/sd-dhcp6-lease.c \
34243424
src/libsystemd-network/dhcp-identifier.h \
34253425
src/libsystemd-network/dhcp-identifier.c \
3426-
src/libsystemd-network/lldp.h \
34273426
src/libsystemd-network/lldp-internal.h \
34283427
src/libsystemd-network/lldp-network.h \
34293428
src/libsystemd-network/lldp-network.c \

‎src/libsystemd-network/lldp-neighbor.c‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "in-addr-util.h"
2525
#include "lldp-internal.h"
2626
#include "lldp-neighbor.h"
27-
#include "lldp.h"
2827
#include "unaligned.h"
2928

3029
static void lldp_neighbor_id_hash_func(const void *p, struct siphash *state) {
@@ -245,7 +244,7 @@ int lldp_neighbor_parse(sd_lldp_neighbor *n) {
245244

246245
switch (type) {
247246

248-
case LLDP_TYPE_END:
247+
case SD_LLDP_TYPE_END:
249248
if (length != 0) {
250249
log_lldp("End marker TLV not zero-sized, ignoring datagram.");
251250
return -EBADMSG;
@@ -257,7 +256,7 @@ int lldp_neighbor_parse(sd_lldp_neighbor *n) {
257256

258257
goto end_marker;
259258

260-
case LLDP_TYPE_CHASSIS_ID:
259+
case SD_LLDP_TYPE_CHASSIS_ID:
261260
if (length < 2 || length > 256) { /* includes the chassis subtype, hence one extra byte */
262261
log_lldp("Chassis ID field size out of range, ignoring datagram.");
263262
return -EBADMSG;
@@ -274,7 +273,7 @@ int lldp_neighbor_parse(sd_lldp_neighbor *n) {
274273
n->id.chassis_id_size = length;
275274
break;
276275

277-
case LLDP_TYPE_PORT_ID:
276+
case SD_LLDP_TYPE_PORT_ID:
278277
if (length < 2 || length > 256) { /* includes the port subtype, hence one extra byte */
279278
log_lldp("Port ID field size out of range, ignoring datagram.");
280279
return -EBADMSG;
@@ -291,7 +290,7 @@ int lldp_neighbor_parse(sd_lldp_neighbor *n) {
291290
n->id.port_id_size = length;
292291
break;
293292

294-
case LLDP_TYPE_TTL:
293+
case SD_LLDP_TYPE_TTL:
295294
if (length != 2) {
296295
log_lldp("TTL field has wrong size, ignoring datagram.");
297296
return -EBADMSG;
@@ -306,25 +305,25 @@ int lldp_neighbor_parse(sd_lldp_neighbor *n) {
306305
n->has_ttl = true;
307306
break;
308307

309-
case LLDP_TYPE_PORT_DESCRIPTION:
308+
case SD_LLDP_TYPE_PORT_DESCRIPTION:
310309
r = parse_string(&n->port_description, p, length);
311310
if (r < 0)
312311
return r;
313312
break;
314313

315-
case LLDP_TYPE_SYSTEM_NAME:
314+
case SD_LLDP_TYPE_SYSTEM_NAME:
316315
r = parse_string(&n->system_name, p, length);
317316
if (r < 0)
318317
return r;
319318
break;
320319

321-
case LLDP_TYPE_SYSTEM_DESCRIPTION:
320+
case SD_LLDP_TYPE_SYSTEM_DESCRIPTION:
322321
r = parse_string(&n->system_description, p, length);
323322
if (r < 0)
324323
return r;
325324
break;
326325

327-
case LLDP_TYPE_SYSTEM_CAPABILITIES:
326+
case SD_LLDP_TYPE_SYSTEM_CAPABILITIES:
328327
if (length != 4)
329328
log_lldp("System capabilities field has wrong size, ignoring.");
330329
else {
@@ -335,7 +334,7 @@ int lldp_neighbor_parse(sd_lldp_neighbor *n) {
335334

336335
break;
337336

338-
case LLDP_TYPE_PRIVATE:
337+
case SD_LLDP_TYPE_PRIVATE:
339338
if (length < 4)
340339
log_lldp("Found private TLV that is too short, ignoring.");
341340

@@ -479,18 +478,18 @@ _public_ int sd_lldp_neighbor_get_chassis_id_as_string(sd_lldp_neighbor *n, cons
479478

480479
switch (*(uint8_t*) n->id.chassis_id) {
481480

482-
case LLDP_CHASSIS_SUBTYPE_CHASSIS_COMPONENT:
483-
case LLDP_CHASSIS_SUBTYPE_INTERFACE_ALIAS:
484-
case LLDP_CHASSIS_SUBTYPE_PORT_COMPONENT:
485-
case LLDP_CHASSIS_SUBTYPE_INTERFACE_NAME:
486-
case LLDP_CHASSIS_SUBTYPE_LOCALLY_ASSIGNED:
481+
case SD_LLDP_CHASSIS_SUBTYPE_CHASSIS_COMPONENT:
482+
case SD_LLDP_CHASSIS_SUBTYPE_INTERFACE_ALIAS:
483+
case SD_LLDP_CHASSIS_SUBTYPE_PORT_COMPONENT:
484+
case SD_LLDP_CHASSIS_SUBTYPE_INTERFACE_NAME:
485+
case SD_LLDP_CHASSIS_SUBTYPE_LOCALLY_ASSIGNED:
487486
k = cescape_length((char*) n->id.chassis_id + 1, n->id.chassis_id_size - 1);
488487
if (!k)
489488
return -ENOMEM;
490489

491490
goto done;
492491

493-
case LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS:
492+
case SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS:
494493
r = format_mac_address(n->id.chassis_id, n->id.chassis_id_size, &k);
495494
if (r < 0)
496495
return r;
@@ -499,7 +498,7 @@ _public_ int sd_lldp_neighbor_get_chassis_id_as_string(sd_lldp_neighbor *n, cons
499498

500499
break;
501500

502-
case LLDP_CHASSIS_SUBTYPE_NETWORK_ADDRESS:
501+
case SD_LLDP_CHASSIS_SUBTYPE_NETWORK_ADDRESS:
503502
r = format_network_address(n->id.chassis_id, n->id.chassis_id_size, &k);
504503
if (r < 0)
505504
return r;
@@ -550,17 +549,17 @@ _public_ int sd_lldp_neighbor_get_port_id_as_string(sd_lldp_neighbor *n, const c
550549

551550
switch (*(uint8_t*) n->id.port_id) {
552551

553-
case LLDP_PORT_SUBTYPE_INTERFACE_ALIAS:
554-
case LLDP_PORT_SUBTYPE_PORT_COMPONENT:
555-
case LLDP_PORT_SUBTYPE_INTERFACE_NAME:
556-
case LLDP_PORT_SUBTYPE_LOCALLY_ASSIGNED:
552+
case SD_LLDP_PORT_SUBTYPE_INTERFACE_ALIAS:
553+
case SD_LLDP_PORT_SUBTYPE_PORT_COMPONENT:
554+
case SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME:
555+
case SD_LLDP_PORT_SUBTYPE_LOCALLY_ASSIGNED:
557556
k = cescape_length((char*) n->id.port_id + 1, n->id.port_id_size - 1);
558557
if (!k)
559558
return -ENOMEM;
560559

561560
goto done;
562561

563-
case LLDP_PORT_SUBTYPE_MAC_ADDRESS:
562+
case SD_LLDP_PORT_SUBTYPE_MAC_ADDRESS:
564563
r = format_mac_address(n->id.port_id, n->id.port_id_size, &k);
565564
if (r < 0)
566565
return r;
@@ -569,7 +568,7 @@ _public_ int sd_lldp_neighbor_get_port_id_as_string(sd_lldp_neighbor *n, const c
569568

570569
break;
571570

572-
case LLDP_PORT_SUBTYPE_NETWORK_ADDRESS:
571+
case SD_LLDP_PORT_SUBTYPE_NETWORK_ADDRESS:
573572
r = format_network_address(n->id.port_id, n->id.port_id_size, &k);
574573
if (r < 0)
575574
return r;
@@ -738,7 +737,7 @@ _public_ int sd_lldp_neighbor_tlv_get_oui(sd_lldp_neighbor *n, uint8_t oui[3], u
738737
assert_return(oui, -EINVAL);
739738
assert_return(subtype, -EINVAL);
740739

741-
r = sd_lldp_neighbor_tlv_is_type(n, LLDP_TYPE_PRIVATE);
740+
r = sd_lldp_neighbor_tlv_is_type(n, SD_LLDP_TYPE_PRIVATE);
742741
if (r < 0)
743742
return r;
744743
if (r == 0)

‎src/libsystemd-network/lldp.h‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎src/libsystemd-network/test-lldp.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "alloc-util.h"
3131
#include "fd-util.h"
3232
#include "lldp-network.h"
33-
#include "lldp.h"
3433
#include "macro.h"
3534
#include "string-util.h"
3635

@@ -127,12 +126,12 @@ static void test_receive_basic_packet(sd_event *e) {
127126
assert_se(sd_lldp_get_neighbors(lldp, &neighbors) == 1);
128127

129128
assert_se(sd_lldp_neighbor_get_chassis_id(neighbors[0], &type, &data, &length) == 0);
130-
assert_se(type == LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS);
129+
assert_se(type == SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS);
131130
assert_se(length == ETH_ALEN);
132131
assert_se(!memcmp(data, "\x00\x01\x02\x03\x04\x05", ETH_ALEN));
133132

134133
assert_se(sd_lldp_neighbor_get_port_id(neighbors[0], &type, &data, &length) == 0);
135-
assert_se(type == LLDP_PORT_SUBTYPE_INTERFACE_NAME);
134+
assert_se(type == SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME);
136135
assert_se(length == 3);
137136
assert_se(strneq((char *) data, "1/3", 3));
138137

@@ -218,23 +217,23 @@ static void test_receive_oui_packet(sd_event *e) {
218217
assert_se(sd_lldp_get_neighbors(lldp, &neighbors) == 1);
219218

220219
assert_se(sd_lldp_neighbor_tlv_rewind(neighbors[0]) >= 0);
221-
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], LLDP_TYPE_CHASSIS_ID) > 0);
220+
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], SD_LLDP_TYPE_CHASSIS_ID) > 0);
222221
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
223-
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], LLDP_TYPE_PORT_ID) > 0);
222+
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], SD_LLDP_TYPE_PORT_ID) > 0);
224223
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
225-
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], LLDP_TYPE_TTL) > 0);
224+
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], SD_LLDP_TYPE_TTL) > 0);
226225
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
227-
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], LLDP_OUI_802_1, LLDP_OUI_802_1_SUBTYPE_PORT_VLAN_ID) > 0);
226+
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], SD_LLDP_OUI_802_1, SD_LLDP_OUI_802_1_SUBTYPE_PORT_VLAN_ID) > 0);
228227
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
229-
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], LLDP_OUI_802_1, LLDP_OUI_802_1_SUBTYPE_PORT_PROTOCOL_VLAN_ID) > 0);
228+
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], SD_LLDP_OUI_802_1, SD_LLDP_OUI_802_1_SUBTYPE_PORT_PROTOCOL_VLAN_ID) > 0);
230229
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
231-
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], LLDP_OUI_802_1, LLDP_OUI_802_1_SUBTYPE_VLAN_NAME) > 0);
230+
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], SD_LLDP_OUI_802_1, SD_LLDP_OUI_802_1_SUBTYPE_VLAN_NAME) > 0);
232231
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
233-
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], LLDP_OUI_802_1, LLDP_OUI_802_1_SUBTYPE_MANAGEMENT_VID) > 0);
232+
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], SD_LLDP_OUI_802_1, SD_LLDP_OUI_802_1_SUBTYPE_MANAGEMENT_VID) > 0);
234233
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
235-
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], LLDP_OUI_802_1, LLDP_OUI_802_1_SUBTYPE_LINK_AGGREGATION) > 0);
234+
assert_se(sd_lldp_neighbor_tlv_is_oui(neighbors[0], SD_LLDP_OUI_802_1, SD_LLDP_OUI_802_1_SUBTYPE_LINK_AGGREGATION) > 0);
236235
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) > 0);
237-
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], LLDP_TYPE_END) > 0);
236+
assert_se(sd_lldp_neighbor_tlv_is_type(neighbors[0], SD_LLDP_TYPE_END) > 0);
238237
assert_se(sd_lldp_neighbor_tlv_next(neighbors[0]) == 0);
239238

240239
sd_lldp_neighbor_unref(neighbors[0]);

‎src/network/networkctl.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "ether-addr-util.h"
3434
#include "fd-util.h"
3535
#include "hwdb-util.h"
36-
#include "lldp.h"
3736
#include "local-addresses.h"
3837
#include "locale-util.h"
3938
#include "netlink-util.h"

‎src/network/networkd-link.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "dhcp-lease-internal.h"
2727
#include "fd-util.h"
2828
#include "fileio.h"
29-
#include "lldp.h"
3029
#include "netlink-util.h"
3130
#include "network-internal.h"
3231
#include "networkd-link.h"
@@ -2234,8 +2233,8 @@ static int link_configure(Link *link) {
22342233

22352234
r = sd_lldp_match_capabilities(link->lldp,
22362235
link->network->lldp_mode == LLDP_MODE_ROUTERS_ONLY ?
2237-
_LLDP_SYSTEM_CAPABILITIES_ALL_ROUTERS :
2238-
_LLDP_SYSTEM_CAPABILITIES_ALL);
2236+
SD_LLDP_SYSTEM_CAPABILITIES_ALL_ROUTERS :
2237+
SD_LLDP_SYSTEM_CAPABILITIES_ALL);
22392238
if (r < 0)
22402239
return r;
22412240

0 commit comments

Comments
 (0)
X Tutup