Fix lldpctl when LLDP-MED is enabled.

Prepare new release.

diff --git a/CHANGELOG b/CHANGELOG
index 9aa83a2e8830efeef9d467901443bf86a05f1a61..4e6945863f3daba8355898e5293a6d4f9093786f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+lldpd (0.3.2)
+
+  * Fix LLDP-MED support
+
+ -- Vincent Bernat <bernat@luffy.cx>
+
 lldpd (0.3.1)
 
   * Misc fixes, including memory leaks

diff --git a/configure.ac b/configure.ac
index 85092041d8cb34af362fa4de6e806ed8af8d56de..4a23fa8189326075294744865e669f5965689024 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(lldpd, 0.3.1, bernat@luffy.cx)
+AC_INIT(lldpd, 0.3.2, bernat@luffy.cx)
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([src/lldpd.c])
 AC_CONFIG_HEADER([config.h])

diff --git a/src/lldpd.h b/src/lldpd.h
index a88a607c10f191fb7a953e2bd238a0301e301659..203da1352ac496718dfd034eeff861b2fc081202 100644 (file)
--- a/src/lldpd.h
+++ b/src/lldpd.h
@@ -104,7 +104,7 @@ struct lldpd_chassis {
        u_int32_t                c_mgmt_if;
 
 #ifdef ENABLE_LLDPMED
-#define STRUCT_LLDPD_CHASSIS_MED "wwbsssssss"
+#define STRUCT_LLDPD_CHASSIS_MED "wbsssssss"
        u_int16_t                c_med_cap_available;
        u_int8_t                 c_med_type;
        char                    *c_med_hw;