diff options
| -rw-r--r-- | src/libsystemd-network/lldp-internal.c | 30 | ||||
| -rw-r--r-- | src/libsystemd-network/lldp-internal.h | 10 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-lldp.c | 6 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/libsystemd-network/lldp-internal.c b/src/libsystemd-network/lldp-internal.c index 2906b5a4b6..7695805946 100644 --- a/src/libsystemd-network/lldp-internal.c +++ b/src/libsystemd-network/lldp-internal.c @@ -30,8 +30,8 @@ int lldp_read_chassis_id(tlv_packet *tlv, uint8_t *type, - uint16_t *length, - uint8_t **data) { + uint8_t **data, + uint16_t *length) { uint8_t subtype; int r; @@ -69,8 +69,8 @@ int lldp_read_chassis_id(tlv_packet *tlv, int lldp_read_port_id(tlv_packet *tlv, uint8_t *type, - uint16_t *length, - uint8_t **data) { + uint8_t **data, + uint16_t *length) { uint8_t subtype; char *s; int r; @@ -137,8 +137,8 @@ int lldp_read_ttl(tlv_packet *tlv, uint16_t *ttl) { } int lldp_read_system_name(tlv_packet *tlv, - uint16_t *length, - char **data) { + char **data, + uint16_t *length) { char *s; int r; @@ -161,8 +161,8 @@ int lldp_read_system_name(tlv_packet *tlv, } int lldp_read_system_description(tlv_packet *tlv, - uint16_t *length, - char **data) { + char **data, + uint16_t *length) { char *s; int r; @@ -185,8 +185,8 @@ int lldp_read_system_description(tlv_packet *tlv, } int lldp_read_port_description(tlv_packet *tlv, - uint16_t *length, - char **data) { + char **data, + uint16_t *length) { char *s; int r; @@ -244,7 +244,7 @@ int lldp_mib_update_objects(lldp_chassis *c, tlv_packet *tlv) { assert_return(c, -EINVAL); assert_return(tlv, -EINVAL); - r = lldp_read_port_id(tlv, &type, &length, &data); + r = lldp_read_port_id(tlv, &type, &data, &length); if (r < 0) return r; @@ -281,7 +281,7 @@ int lldp_mib_remove_objects(lldp_chassis *c, tlv_packet *tlv) { assert_return(c, -EINVAL); assert_return(tlv, -EINVAL); - r = lldp_read_port_id(tlv, &type, &length, &data); + r = lldp_read_port_id(tlv, &type, &data, &length); if (r < 0) return r; @@ -312,7 +312,7 @@ int lldp_mib_add_objects(Prioq *by_expiry, assert_return(neighbour_mib, -EINVAL); assert_return(tlv, -EINVAL); - r = lldp_read_chassis_id(tlv, &subtype, &length, &data); + r = lldp_read_chassis_id(tlv, &subtype, &data, &length); if (r < 0) goto drop; @@ -452,7 +452,7 @@ int lldp_neighbour_port_new(lldp_chassis *c, assert(tlv); - r = lldp_read_port_id(tlv, &type, &length, &data); + r = lldp_read_port_id(tlv, &type, &data, &length); if (r < 0) return r; @@ -505,7 +505,7 @@ int lldp_chassis_new(tlv_packet *tlv, assert(tlv); - r = lldp_read_chassis_id(tlv, &type, &length, &data); + r = lldp_read_chassis_id(tlv, &type, &data, &length); if (r < 0) return r; diff --git a/src/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-internal.h index f4eadbb87e..c61080828b 100644 --- a/src/libsystemd-network/lldp-internal.h +++ b/src/libsystemd-network/lldp-internal.h @@ -86,13 +86,13 @@ int lldp_mib_update_objects(lldp_chassis *c, tlv_packet *tlv); int lldp_mib_add_objects(Prioq *by_expiry, Hashmap *neighbour_mib, tlv_packet *tlv); int lldp_mib_remove_objects(lldp_chassis *c, tlv_packet *tlv); -int lldp_read_chassis_id(tlv_packet *tlv, uint8_t *type, uint16_t *length, uint8_t **data); -int lldp_read_port_id(tlv_packet *tlv, uint8_t *type, uint16_t *length, uint8_t **data); +int lldp_read_chassis_id(tlv_packet *tlv, uint8_t *type, uint8_t **data, uint16_t *length); +int lldp_read_port_id(tlv_packet *tlv, uint8_t *type, uint8_t **data, uint16_t *length); int lldp_read_ttl(tlv_packet *tlv, uint16_t *ttl); -int lldp_read_system_name(tlv_packet *tlv, uint16_t *length, char **data); -int lldp_read_system_description(tlv_packet *tlv, uint16_t *length, char **data); +int lldp_read_system_name(tlv_packet *tlv, char **data, uint16_t *length); +int lldp_read_system_description(tlv_packet *tlv, char **data, uint16_t *length); int lldp_read_system_capability(tlv_packet *tlv, uint16_t *data); -int lldp_read_port_description(tlv_packet *tlv, uint16_t *length, char **data); +int lldp_read_port_description(tlv_packet *tlv, char **data, uint16_t *length); int lldp_handle_packet(tlv_packet *m, uint16_t length); #define log_lldp(fmt, ...) log_internal(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "LLDP: " fmt, ##__VA_ARGS__) diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index 53cd19a750..5a03ab4448 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -455,7 +455,7 @@ int sd_lldp_save(sd_lldp *lldp, const char *lldp_file) { _cleanup_free_ char *s = NULL; char *k, *t; - r = lldp_read_chassis_id(p->packet, &type, &length, &mac); + r = lldp_read_chassis_id(p->packet, &type, &mac, &length); if (r < 0) continue; @@ -468,7 +468,7 @@ int sd_lldp_save(sd_lldp *lldp, const char *lldp_file) { goto fail; } - r = lldp_read_port_id(p->packet, &type, &length, &port_id); + r = lldp_read_port_id(p->packet, &type, &port_id, &length); if (r < 0) continue; @@ -513,7 +513,7 @@ int sd_lldp_save(sd_lldp *lldp, const char *lldp_file) { free(s); s = k; - r = lldp_read_system_name(p->packet, &length, &k); + r = lldp_read_system_name(p->packet, &k, &length); if (r < 0) k = strappend(s, "'_NAME=N/A' "); else { |