From 1e388a697bb8d7d20d7add5e5dc1b793a9f43ae6 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sat, 8 Sep 2012 15:00:05 +0200 Subject: [PATCH] build: fix compilation without LLDP MED --- src/daemon/agent.c | 6 +++++- src/lib/atom-private.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/daemon/agent.c b/src/daemon/agent.c index d7899892..0a26522c 100644 --- a/src/daemon/agent.c +++ b/src/daemon/agent.c @@ -217,7 +217,9 @@ header_tprindexed_table(struct variable *vp, oid *name, size_t *length, TAILQ_FOREACH(hardware, &scfg->g_hardware, h_entries) { TAILQ_FOREACH(port, &hardware->h_rports, p_entries) { if (SMART_HIDDEN(port)) continue; +#ifdef ENABLE_LLDPMED if (withmed && !port->p_chassis->c_med_cap_available) continue; +#endif index[0] = lastchange(port); index[1] = hardware->h_ifindex; index[2] = port->p_chassis->c_index; @@ -293,6 +295,7 @@ header_tpripindexed_table(struct variable *vp, oid *name, size_t *length, return header_index_best(); } +#ifdef ENABLE_LLDPMED #define TPR_VARIANT_MED_POLICY 2 #define TPR_VARIANT_MED_LOCATION 3 static void* @@ -345,6 +348,7 @@ header_tprmedindexed_table(struct variable *vp, oid *name, size_t *length, } return header_index_best(); } +#endif #ifdef ENABLE_DOT1 static struct lldpd_vlan* @@ -898,7 +902,7 @@ agent_v_med_policy(struct variable *vp, size_t *var_len, return (u_char *)&long_ret; default: return NULL; - } + } } static u_char* agent_h_remote_med_policy(struct variable *vp, oid *name, size_t *length, diff --git a/src/lib/atom-private.c b/src/lib/atom-private.c index d1872b9f..c02c3521 100644 --- a/src/lib/atom-private.c +++ b/src/lib/atom-private.c @@ -349,8 +349,10 @@ _lldpctl_atom_get_int_config(lldpctl_atom_t *atom, lldpctl_key_t key) return c->config->c_receiveonly; case lldpctl_k_config_advertise_version: return c->config->c_advertise_version; +#ifdef ENABLE_LLDPMED case lldpctl_k_config_lldpmed_noinventory: return c->config->c_noinventory; +#endif default: return SET_ERROR(atom->conn, LLDPCTL_ERR_NOT_EXIST); } -- 2.39.5