zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / smux.h

diff --git a/lib/smux.h b/lib/smux.h
index e94a7a9cc97c7d7ce8ef7ec5db7e19827c2e2eef..9adfacb3e45d5e55377513635c5dac84008cb5ca 100644 (file)
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -41,43 +41,37 @@
 #define IN_ADDR_SIZE sizeof(struct in_addr)
 
 #undef REGISTER_MIB
-#define REGISTER_MIB(descr, var, vartype, theoid)              \
-    smux_register_mib(descr, (struct variable *)var, sizeof(struct vartype), \
-    sizeof(var)/sizeof(struct vartype),                        \
-    theoid, sizeof(theoid)/sizeof(oid))
-
-struct trap_object
-{
-  int namelen; /* Negative if the object is not indexed */
-  oid name[MAX_OID_LEN];
+#define REGISTER_MIB(descr, var, vartype, theoid)                              \
+       smux_register_mib(descr, (struct variable *)var,                       \
+                         sizeof(struct vartype),                              \
+                         sizeof(var) / sizeof(struct vartype), theoid,        \
+                         sizeof(theoid) / sizeof(oid))
+
+struct trap_object {
+       int namelen; /* Negative if the object is not indexed */
+       oid name[MAX_OID_LEN];
 };
 
 /* Declare SMUX return value. */
-#define SNMP_LOCAL_VARIABLES \
-  static long snmp_int_val __attribute__ ((unused)); \
-  static struct in_addr snmp_in_addr_val __attribute__ ((unused));
-
-#define SNMP_INTEGER(V) \
-  ( \
-    *var_len = sizeof (snmp_int_val), \
-    snmp_int_val = V, \
-    (u_char *) &snmp_int_val \
-  )
-
-#define SNMP_IPADDRESS(V) \
-  ( \
-    *var_len = sizeof (struct in_addr), \
-    snmp_in_addr_val = V, \
-    (u_char *) &snmp_in_addr_val \
-  )
-
-extern void smux_init (struct thread_master *tm);
-extern void smux_register_mib(const char *, struct variable *, 
-                              size_t, int, oid [], size_t);
-extern int smux_header_generic (struct variable *, oid [], size_t *, 
-                                int, size_t *, WriteMethod **);
-extern int smux_header_table (struct variable *, oid *, size_t *, 
-                             int, size_t *, WriteMethod **);
+#define SNMP_LOCAL_VARIABLES                                                   \
+       static long snmp_int_val __attribute__((unused));                      \
+       static struct in_addr snmp_in_addr_val __attribute__((unused));
+
+#define SNMP_INTEGER(V)                                                        \
+       (*var_len = sizeof(snmp_int_val), snmp_int_val = V,                    \
+        (uint8_t *)&snmp_int_val)
+
+#define SNMP_IPADDRESS(V)                                                      \
+       (*var_len = sizeof(struct in_addr), snmp_in_addr_val = V,              \
+        (uint8_t *)&snmp_in_addr_val)
+
+extern void smux_init(struct thread_master *tm);
+extern void smux_register_mib(const char *, struct variable *, size_t, int,
+                             oid[], size_t);
+extern int smux_header_generic(struct variable *, oid[], size_t *, int,
+                              size_t *, WriteMethod **);
+extern int smux_header_table(struct variable *, oid *, size_t *, int, size_t *,
+                            WriteMethod **);
 
 /* For traps, three OID are provided:
 
@@ -100,16 +94,13 @@ extern int smux_header_table (struct variable *, oid *, size_t *,
  The use of the arguments may differ depending on the implementation
  used.
 */
-extern int smux_trap (struct variable *, size_t,
-                     const oid *, size_t,
-                     const oid *, size_t,
-                     const oid *, size_t,
-                     const struct trap_object *, size_t,
-                     u_char);
-
-extern int oid_compare (const oid *, int, const oid *, int);
-extern void oid2in_addr (oid [], int, struct in_addr *);
-extern void *oid_copy (void *, const void *, size_t);
-extern void oid_copy_addr (oid [], struct in_addr *, int);
+extern int smux_trap(struct variable *, size_t, const oid *, size_t,
+                    const oid *, size_t, const oid *, size_t,
+                    const struct trap_object *, size_t, uint8_t);
+
+extern int oid_compare(const oid *, int, const oid *, int);
+extern void oid2in_addr(oid[], int, struct in_addr *);
+extern void *oid_copy(void *, const void *, size_t);
+extern void oid_copy_addr(oid[], struct in_addr *, int);
 
 #endif /* _ZEBRA_SNMP_H */