]> git.ipfire.org Git - thirdparty/lldpd.git/commitdiff
build: fix compilation without LLDP MED
authorVincent Bernat <bernat@luffy.cx>
Sat, 8 Sep 2012 13:00:05 +0000 (15:00 +0200)
committerVincent Bernat <bernat@luffy.cx>
Sat, 8 Sep 2012 13:00:14 +0000 (15:00 +0200)
src/daemon/agent.c
src/lib/atom-private.c

index d7899892022a4f8cfd27239905b2450aa1b6fe67..0a26522c4193c4ab45ae557426b0f0e62d7c3be7 100644 (file)
@@ -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,
index d1872b9f44d4e3d6265c595be525a86d0c4011d8..c02c3521bdcd950ccf2d3f5fc6da4f1482a655f4 100644 (file)
@@ -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);
        }