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 fed28ae13ff3def97df2905287cfb4b9ddaf2841..fcfd176612c438772ac2dff4a377c1513a5f7595 100644 (file)
--- 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 e0236fc8b9ccf071a1eaaafe7d847d3f1258afb6..75f733b687d0c5b11ef6d3c4e542a5d6b84c5258 100644 (file)
--- 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 2fee65b2d619a07d65febc6cdba41f5f39087c1c..151496355cf8c40ca6aeb12789cafa2ae51ca040 100644 (file)
--- 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 0ca28a73d014aa974ea147586883067f1e1702c5..9677708f839323e60c41cf9f86106e4f6c5bea64 100644 (file)
--- 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 5a7c40d5b80bf8236bfb9e14901c4e080e09271e..5439e7e4bb0267a1bb1733e0a4fbe63f7843681a 100644 (file)
--- 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 ee002fd9f88c28b313bd27f5cd7cc224e5a1b927..564a4114e95b4d83a38dc10275e33259252cf632 100644 (file)
--- 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 042f59b50edefac314062d0766f91d2fd7a720f0..b3bd1550c9c7ade170e171149e6d6d2963b94190 100644 (file)
--- 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 0b0834311e28fb3bc5d7d23c7533900186285813..d1872b9f44d4e3d6265c595be525a86d0c4011d8 100644 (file)
--- 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 478eea9204d63a981e060319de035daa4506c4d1..043b8ee27c380fb0eb07f174c09908eb38f5e332 100644 (file)
--- 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 41cf49e5528aa40ac44a7a9121bdbb8d66ceaff8..315f41fa06ba9e7e89b818dca18e20fb918cc854 100644 (file)
--- 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 dbe0c6689e10991a9efb1c54e43c646c3905b6dd..9588fb6f102238511c121fbf01ef2358c6438a48 100644 (file)
--- 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
        }
 };