From: Vincent Bernat Date: Sat, 1 Sep 2012 16:54:28 +0000 (+0200) Subject: general: use "TX interval" instead of "TX delay" to be more coherent with the MIB X-Git-Tag: 0.6.1~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8843f168973909d088f493ea7e304139384f1351;p=thirdparty%2Flldpd.git general: use "TX interval" instead of "TX delay" to be more coherent with the MIB --- diff --git a/src/client/display.c b/src/client/display.c index fed28ae1..fcfd1766 100644 --- a/src/client/display.c +++ b/src/client/display.c @@ -602,7 +602,7 @@ display_configuration(lldpctl_conn_t *conn, struct writer *w) tag_start(w, "config", "Configuration"); tag_datatag(w, "tx-delay", "Transmit delay", - lldpctl_atom_get_str(configuration, lldpctl_k_config_delay)); + lldpctl_atom_get_str(configuration, lldpctl_k_config_tx_interval)); tag_datatag(w, "rx-only", "Receive mode", lldpctl_atom_get_int(configuration, lldpctl_k_config_receiveonly)? "yes":"no"); diff --git a/src/client/lldpctl.c b/src/client/lldpctl.c index e0236fc8..75f733b6 100644 --- a/src/client/lldpctl.c +++ b/src/client/lldpctl.c @@ -211,7 +211,7 @@ main(int argc, char *argv[]) lldpctl_last_strerror(conn)); } else { if (lldpctl_atom_set_int(config, - lldpctl_k_config_delay, -1) == NULL) { + lldpctl_k_config_tx_interval, -1) == NULL) { LLOG_WARNX("unable to ask lldpd for immediate retransmission. %s", lldpctl_last_strerror(conn)); } else diff --git a/src/daemon/agent.c b/src/daemon/agent.c index 2fee65b2..15149635 100644 --- a/src/daemon/agent.c +++ b/src/daemon/agent.c @@ -599,10 +599,10 @@ agent_h_scalars(struct variable *vp, oid *name, size_t *length, switch (vp->magic) { case LLDP_SNMP_TXINTERVAL: - long_ret = scfg->g_config.c_delay; + long_ret = scfg->g_config.c_tx_interval; return (u_char *)&long_ret; case LLDP_SNMP_TXMULTIPLIER: - long_ret = LOCAL_CHASSIS(scfg)->c_ttl / scfg->g_config.c_delay; + long_ret = LOCAL_CHASSIS(scfg)->c_ttl / scfg->g_config.c_tx_interval; return (u_char *)&long_ret; case LLDP_SNMP_REINITDELAY: long_ret = 1; diff --git a/src/daemon/client.c b/src/daemon/client.c index 0ca28a73..9677708f 100644 --- a/src/daemon/client.c +++ b/src/daemon/client.c @@ -55,10 +55,10 @@ client_handle_set_configuration(struct lldpd *cfg, enum hmsg_type *type, /* What needs to be done? Currently, we only support setting the * transmit delay. */ - if (config->c_delay > 0) { - cfg->g_config.c_delay = config->c_delay; + if (config->c_tx_interval > 0) { + cfg->g_config.c_tx_interval = config->c_tx_interval; } - if (config->c_delay < 0) { + if (config->c_tx_interval < 0) { LLOG_DEBUG("client asked for immediate retransmission"); levent_send_now(cfg); } diff --git a/src/daemon/event.c b/src/daemon/event.c index 5a7c40d5..5439e7e4 100644 --- a/src/daemon/event.c +++ b/src/daemon/event.c @@ -392,7 +392,7 @@ static void levent_update_and_send(evutil_socket_t fd, short what, void *arg) { struct lldpd *cfg = arg; - struct timeval tv = {cfg->g_config.c_delay, 0}; + struct timeval tv = {cfg->g_config.c_tx_interval, 0}; (void)fd; (void)what; lldpd_loop(cfg); event_add(cfg->g_main_loop, &tv); diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c index ee002fd9..564a4114 100644 --- a/src/daemon/lldpd.c +++ b/src/daemon/lldpd.c @@ -1114,7 +1114,7 @@ lldpd_main(int argc, char *argv[]) /* Get ioctl socket */ if ((cfg->g_sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) fatal("failed to get ioctl socket"); - cfg->g_config.c_delay = LLDPD_TX_DELAY; + cfg->g_config.c_tx_interval = LLDPD_TX_INTERVAL; /* Description */ if (!(cfg->g_config.c_advertise_version = advertise_version) && lsb_release) diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h index 042f59b5..b3bd1550 100644 --- a/src/daemon/lldpd.h +++ b/src/daemon/lldpd.h @@ -75,7 +75,7 @@ struct event_base; #define SYSFS_CLASS_NET "/sys/class/net/" #define SYSFS_CLASS_DMI "/sys/class/dmi/id/" #define LLDPD_TTL 120 -#define LLDPD_TX_DELAY 30 +#define LLDPD_TX_INTERVAL 30 #define LLDPD_TX_MSGDELAY 1 #define LLDPD_PID_FILE "/var/run/lldpd.pid" diff --git a/src/lib/atom-private.c b/src/lib/atom-private.c index 0b083431..d1872b9f 100644 --- a/src/lib/atom-private.c +++ b/src/lib/atom-private.c @@ -343,8 +343,8 @@ _lldpctl_atom_get_int_config(lldpctl_atom_t *atom, lldpctl_key_t key) struct _lldpctl_atom_config_t *c = (struct _lldpctl_atom_config_t *)atom; switch (key) { - case lldpctl_k_config_delay: - return c->config->c_delay; + case lldpctl_k_config_tx_interval: + return c->config->c_tx_interval; case lldpctl_k_config_receiveonly: return c->config->c_receiveonly; case lldpctl_k_config_advertise_version: @@ -367,9 +367,9 @@ _lldpctl_atom_set_int_config(lldpctl_atom_t *atom, lldpctl_key_t key, memset(&config, 0, sizeof(struct lldpd_config)); switch (key) { - case lldpctl_k_config_delay: - config.c_delay = value; - if (value > 0) c->config->c_delay = value; + case lldpctl_k_config_tx_interval: + config.c_tx_interval = value; + if (value > 0) c->config->c_tx_interval = value; break; default: SET_ERROR(atom->conn, LLDPCTL_ERR_NOT_EXIST); diff --git a/src/lib/lldpctl.h b/src/lib/lldpctl.h index 478eea92..043b8ee2 100644 --- a/src/lib/lldpctl.h +++ b/src/lib/lldpctl.h @@ -554,7 +554,7 @@ lldpctl_atom_t *lldpctl_get_port(lldpctl_atom_t *port); * first write to a (A,W), then to a (A,WO)). */ typedef enum { - lldpctl_k_config_delay, /**< `(I,WO)` Transmit delay. When set to -1, it is meant to transmit now. */ + lldpctl_k_config_tx_interval, /**< `(I,WO)` Transmit interval. When set to -1, it is meant to transmit now. */ lldpctl_k_config_receiveonly, /**< `(I)` Receive only mode */ lldpctl_k_config_mgmt_pattern, /**< `(S)` Pattern to choose the management address */ lldpctl_k_config_iface_pattern, /**< `(S)` Pattern of enabled interfaces */ diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h index 41cf49e5..315f41fa 100644 --- a/src/lldpd-structs.h +++ b/src/lldpd-structs.h @@ -304,7 +304,7 @@ MARSHAL_END; SMART_OUTGOING_ONE_NEIGH) struct lldpd_config { - int c_delay; /* Transmit delay */ + int c_tx_interval; /* Transmit interval */ int c_smart; /* Bitmask for smart configuration (see SMART_*) */ int c_receiveonly; /* Receive only mode */ diff --git a/tests/check_snmp.c b/tests/check_snmp.c index dbe0c668..9588fb6f 100644 --- a/tests/check_snmp.c +++ b/tests/check_snmp.c @@ -16,7 +16,7 @@ extern int asprintf (char **, char *, ...); /* Our test config */ struct lldpd test_cfg = { .g_config = { - .c_delay = 30, + .c_tx_interval = 30, .c_smart = 0 } };