zebra: Refactor kernel_rtm to be a bit smarter about how it handles options

[mirror_frr.git] / ospf6d / ospf6_message.h

diff --git a/ospf6d/ospf6_message.h b/ospf6d/ospf6_message.h
index b0107dffff209b1d152bf6a06b18779060012808..d24b7f89420e68a1e790c1d20c31c91f55699832 100644 (file)
--- a/ospf6d/ospf6_message.h
+++ b/ospf6d/ospf6_message.h
@@ -27,12 +27,12 @@
 extern unsigned char conf_debug_ospf6_message[];
 #define OSPF6_DEBUG_MESSAGE_SEND 0x01
 #define OSPF6_DEBUG_MESSAGE_RECV 0x02
-#define OSPF6_DEBUG_MESSAGE_ON(type, level) \
-  (conf_debug_ospf6_message[type] |= (level))
-#define OSPF6_DEBUG_MESSAGE_OFF(type, level) \
-  (conf_debug_ospf6_message[type] &= ~(level))
-#define IS_OSPF6_DEBUG_MESSAGE(t, e) \
-  (conf_debug_ospf6_message[t] & OSPF6_DEBUG_MESSAGE_ ## e)
+#define OSPF6_DEBUG_MESSAGE_ON(type, level)                                    \
+       (conf_debug_ospf6_message[type] |= (level))
+#define OSPF6_DEBUG_MESSAGE_OFF(type, level)                                   \
+       (conf_debug_ospf6_message[type] &= ~(level))
+#define IS_OSPF6_DEBUG_MESSAGE(t, e)                                           \
+       (conf_debug_ospf6_message[t] & OSPF6_DEBUG_MESSAGE_##e)
 
 /* Type */
 #define OSPF6_MESSAGE_TYPE_UNKNOWN  0x0
@@ -45,45 +45,42 @@ extern unsigned char conf_debug_ospf6_message[];
 
 /* OSPFv3 packet header */
 #define OSPF6_HEADER_SIZE                     16U
-struct ospf6_header
-{
-  u_char    version;
-  u_char    type;
-  u_int16_t length;
-  u_int32_t router_id;
-  u_int32_t area_id;
-  u_int16_t checksum;
-  u_char    instance_id;
-  u_char    reserved;
+struct ospf6_header {
+       uint8_t version;
+       uint8_t type;
+       uint16_t length;
+       uint32_t router_id;
+       uint32_t area_id;
+       uint16_t checksum;
+       uint8_t instance_id;
+       uint8_t reserved;
 };
 
 #define OSPF6_MESSAGE_END(H) ((caddr_t) (H) + ntohs ((H)->length))
 
 /* Hello */
 #define OSPF6_HELLO_MIN_SIZE                  20U
-struct ospf6_hello
-{
-  ifindex_t interface_id;
-  u_char    priority;
-  u_char    options[3];
-  u_int16_t hello_interval;
-  u_int16_t dead_interval;
-  u_int32_t drouter;
-  u_int32_t bdrouter;
-  /* Followed by Router-IDs */
+struct ospf6_hello {
+       ifindex_t interface_id;
+       uint8_t priority;
+       uint8_t options[3];
+       uint16_t hello_interval;
+       uint16_t dead_interval;
+       uint32_t drouter;
+       uint32_t bdrouter;
+       /* Followed by Router-IDs */
 };
 
 /* Database Description */
 #define OSPF6_DB_DESC_MIN_SIZE                12U
-struct ospf6_dbdesc
-{
-  u_char    reserved1;
-  u_char    options[3];
-  u_int16_t ifmtu;
-  u_char    reserved2;
-  u_char    bits;
-  u_int32_t seqnum;
-  /* Followed by LSA Headers */
+struct ospf6_dbdesc {
+       uint8_t reserved1;
+       uint8_t options[3];
+       uint16_t ifmtu;
+       uint8_t reserved2;
+       uint8_t bits;
+       uint32_t seqnum;
+       /* Followed by LSA Headers */
 };
 
 #define OSPF6_DBDESC_MSBIT (0x01) /* master/slave bit */
@@ -94,20 +91,18 @@ struct ospf6_dbdesc
 #define OSPF6_LS_REQ_MIN_SIZE                  0U
 /* It is just a sequence of entries below */
 #define OSPF6_LSREQ_LSDESC_FIX_SIZE           12U
-struct ospf6_lsreq_entry
-{
-  u_int16_t reserved;     /* Must Be Zero */
-  u_int16_t type;         /* LS type */
-  u_int32_t id;           /* Link State ID */
-  u_int32_t adv_router;   /* Advertising Router */
+struct ospf6_lsreq_entry {
+       uint16_t reserved;   /* Must Be Zero */
+       uint16_t type;       /* LS type */
+       uint32_t id;     /* Link State ID */
+       uint32_t adv_router; /* Advertising Router */
 };
 
 /* Link State Update */
 #define OSPF6_LS_UPD_MIN_SIZE                  4U
-struct ospf6_lsupdate
-{
-  u_int32_t lsa_number;
-  /* Followed by LSAs */
+struct ospf6_lsupdate {
+       uint32_t lsa_number;
+       /* Followed by LSAs */
 };
 
 /* Link State Acknowledgement */
@@ -115,27 +110,26 @@ struct ospf6_lsupdate
 /* It is just a sequence of LSA Headers */
 
 /* Function definition */
-extern void ospf6_hello_print (struct ospf6_header *);
-extern void ospf6_dbdesc_print (struct ospf6_header *);
-extern void ospf6_lsreq_print (struct ospf6_header *);
-extern void ospf6_lsupdate_print (struct ospf6_header *);
-extern void ospf6_lsack_print (struct ospf6_header *);
-
-extern int ospf6_iobuf_size (unsigned int size);
-extern void ospf6_message_terminate (void);
-extern int ospf6_receive (struct thread *thread);
-
-extern int ospf6_hello_send (struct thread *thread);
-extern int ospf6_dbdesc_send (struct thread *thread);
-extern int ospf6_dbdesc_send_newone (struct thread *thread);
-extern int ospf6_lsreq_send (struct thread *thread);
-extern int ospf6_lsupdate_send_interface (struct thread *thread);
-extern int ospf6_lsupdate_send_neighbor (struct thread *thread);
-extern int ospf6_lsack_send_interface (struct thread *thread);
-extern int ospf6_lsack_send_neighbor (struct thread *thread);
-
-extern int config_write_ospf6_debug_message (struct vty *);
-extern void install_element_ospf6_debug_message (void);
+extern void ospf6_hello_print(struct ospf6_header *);
+extern void ospf6_dbdesc_print(struct ospf6_header *);
+extern void ospf6_lsreq_print(struct ospf6_header *);
+extern void ospf6_lsupdate_print(struct ospf6_header *);
+extern void ospf6_lsack_print(struct ospf6_header *);
+
+extern int ospf6_iobuf_size(unsigned int size);
+extern void ospf6_message_terminate(void);
+extern int ospf6_receive(struct thread *thread);
+
+extern int ospf6_hello_send(struct thread *thread);
+extern int ospf6_dbdesc_send(struct thread *thread);
+extern int ospf6_dbdesc_send_newone(struct thread *thread);
+extern int ospf6_lsreq_send(struct thread *thread);
+extern int ospf6_lsupdate_send_interface(struct thread *thread);
+extern int ospf6_lsupdate_send_neighbor(struct thread *thread);
+extern int ospf6_lsack_send_interface(struct thread *thread);
+extern int ospf6_lsack_send_neighbor(struct thread *thread);
+
+extern int config_write_ospf6_debug_message(struct vty *);
+extern void install_element_ospf6_debug_message(void);
 
 #endif /* OSPF6_MESSAGE_H */
-