lib, zebra: add missing extern "C" {} blocks to new header files

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
FRRouting · Apr 23, 2020 · 17e3820 · 17e3820
1 parent 86ac1fa
commit 17e3820
Show file tree

Hide file tree

Showing 20 changed files with 160 additions and 0 deletions.
diff --git a/lib/atomlist.h b/lib/atomlist.h
@@ -20,6 +20,10 @@
 #include "typesafe.h"
 #include "frratomic.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* pointer with lock/deleted/invalid bit in lowest bit
  *
  * for atomlist/atomsort, "locked" means "this pointer can't be updated, the
@@ -361,4 +365,8 @@ void atomsort_del_hint(struct atomsort_head *h,
 
 struct atomsort_item *atomsort_pop(struct atomsort_head *h);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRR_ATOMLIST_H */
diff --git a/lib/defaults.h b/lib/defaults.h
@@ -22,6 +22,10 @@
 
 #include "compiler.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* frr_default wraps information about a default that has different
  * values depending on FRR version or default-set
  *
@@ -135,4 +139,8 @@ extern bool frr_defaults_profile_valid(const char *profile);
 /* like strcmp(), but with version ordering */
 extern int frr_version_cmp(const char *aa, const char *bb);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRR_DEFAULTS_H */
diff --git a/lib/frrcu.h b/lib/frrcu.h
@@ -20,6 +20,10 @@
 #include "memory.h"
 #include "atomlist.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* quick RCU primer:
  *   There's a global sequence counter.  Whenever a thread does a
  *   rcu_read_lock(), it is marked as holding the current sequence counter.
@@ -170,4 +174,8 @@ extern void rcu_enqueue(struct rcu_head *head, const struct rcu_action *action);
 
 extern void rcu_close(struct rcu_head_close *head, int fd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRRCU_H */
diff --git a/lib/iana_afi.h b/lib/iana_afi.h
@@ -21,6 +21,10 @@
 
 #include <prefix.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * The above AFI and SAFI definitions are for internal use. The protocol
  * definitions (IANA values) as for example used in BGP protocol packets
@@ -130,4 +134,8 @@ static inline const char *iana_safi2str(iana_safi_t safi)
 	return safi2str(safi_iana2int(safi));
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/lib/log_vty.h b/lib/log_vty.h
@@ -23,6 +23,10 @@
 
 #include "lib/hook.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct vty;
 
 extern void log_cmd_init(void);
@@ -33,4 +37,8 @@ extern void log_show_syslog(struct vty *vty);
 DECLARE_HOOK(zlog_rotate, (), ())
 extern void zlog_rotate(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __LOG_VTY_H__ */
diff --git a/lib/printfrr.h b/lib/printfrr.h
@@ -24,6 +24,10 @@
 #include "compiler.h"
 #include "memory.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct fbuf {
 	char *buf;
 	char *pos;
@@ -156,4 +160,8 @@ void printfrr_ext_reg(const struct printfrr_ext *);
 	}                                                                      \
 	/* end */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/lib/pullwr.h b/lib/pullwr.h
@@ -26,6 +26,10 @@
 #include "thread.h"
 #include "stream.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct pullwr;
 
 /* This is a "pull-driven" write event handler.  Instead of having some buffer
@@ -107,4 +111,8 @@ static inline void pullwr_write_stream(struct pullwr *pullwr,
 extern void pullwr_stats(struct pullwr *pullwr, uint64_t *total_written,
 			 size_t *pending, size_t *kernel_pending);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _WRITEPOLL_H */
diff --git a/lib/resolver.h b/lib/resolver.h
@@ -13,6 +13,10 @@
 #include "thread.h"
 #include "sockunion.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct resolver_query {
 	void (*callback)(struct resolver_query *, const char *errstr, int n,
 			 union sockunion *);
@@ -28,4 +32,8 @@ void resolver_resolve(struct resolver_query *query, int af,
 						       const char *, int,
 						       union sockunion *));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRR_RESOLVER_H */
diff --git a/lib/seqlock.h b/lib/seqlock.h
@@ -27,6 +27,10 @@
 #include <pthread.h>
 #include "frratomic.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * this locking primitive is intended to use in a 1:N setup.
  *
@@ -135,4 +139,8 @@ extern void seqlock_release(struct seqlock *sqlo);
  * anything other than reading RCU items was done
  */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _SEQLOCK_H */
diff --git a/lib/version.h.in b/lib/version.h.in
@@ -28,6 +28,10 @@
 #include "gitversion.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef GIT_SUFFIX
 #define GIT_SUFFIX ""
 #endif
@@ -54,4 +58,8 @@
 
 pid_t pid_output (const char *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ZEBRA_VERSION_H */
diff --git a/lib/yang_wrappers.h b/lib/yang_wrappers.h
@@ -22,6 +22,10 @@
 
 #include "prefix.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* bool */
 extern bool yang_str2bool(const char *value);
 extern struct yang_data *yang_data_new_bool(const char *xpath, bool value);
@@ -182,4 +186,8 @@ extern void yang_str2mac(const char *value, struct ethaddr *mac);
 
 extern const char *yang_nexthop_type2str(uint32_t ntype);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRR_NORTHBOUND_WRAPPERS_H_ */
diff --git a/lib/zassert.h b/lib/zassert.h
@@ -19,6 +19,10 @@
 #ifndef _QUAGGA_ASSERT_H
 #define _QUAGGA_ASSERT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern void _zlog_assert_failed(const char *assertion, const char *file,
 				unsigned int line, const char *function)
 	__attribute__((noreturn));
@@ -39,4 +43,8 @@ extern void _zlog_assert_failed(const char *assertion, const char *file,
 #undef assert
 #define assert(EX) zassert(EX)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _QUAGGA_ASSERT_H */
diff --git a/lib/zclient.h b/lib/zclient.h
@@ -38,6 +38,10 @@
 
 #include "mlag.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Zebra types. Used in Zserv message header. */
 typedef uint16_t zebra_size_t;
 
@@ -826,4 +830,8 @@ extern void zclient_send_mlag_data(struct zclient *client,
  */
 extern int zclient_send_hello(struct zclient *client);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ZEBRA_ZCLIENT_H */
diff --git a/lib/zlog.h b/lib/zlog.h
@@ -30,6 +30,10 @@
 #include "memory.h"
 #include "hook.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern char zlog_prefix[];
 extern size_t zlog_prefixsz;
 extern int zlog_tmpdirfd;
@@ -183,4 +187,8 @@ extern void zlog_tls_buffer_init(void);
 extern void zlog_tls_buffer_flush(void);
 extern void zlog_tls_buffer_fini(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRR_ZLOG_H */
diff --git a/lib/zlog_targets.h b/lib/zlog_targets.h
@@ -21,6 +21,10 @@
 
 #include "zlog.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* multiple file log targets can be active */
 
 struct zlt_fd;
@@ -63,4 +67,8 @@ extern int zlog_syslog_get_facility(void);
 extern void zlog_syslog_set_prio_min(int prio_min);
 extern int zlog_syslog_get_prio_min(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FRR_ZLOG_TARGETS_H */
diff --git a/zebra/zebra_mlag.h b/zebra/zebra_mlag.h
@@ -30,6 +30,10 @@
 #include "mlag/mlag.pb-c.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define ZEBRA_MLAG_BUF_LIMIT 2048
 #define ZEBRA_MLAG_LEN_SIZE 4
 
@@ -73,4 +77,8 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s,
 					   uint32_t *msg_type);
 int zebra_mlag_protobuf_decode_message(struct stream *s, uint8_t *data,
 				       uint32_t len);
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/zebra/zebra_mlag_vty.h b/zebra/zebra_mlag_vty.h
@@ -22,10 +22,18 @@
 #ifndef __ZEBRA_MLAG_VTY_CODE__
 #define __ZEBRA_MLAG_VTY_CODE__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int32_t zebra_mlag_test_mlag_internal(const char *none,
 					     const char *primary,
 					     const char *secondary);
 
 extern void zebra_mlag_vty_init(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/zebra/zebra_nb.h b/zebra/zebra_nb.h
@@ -20,6 +20,10 @@
 #ifndef ZEBRA_ZEBRA_NB_H_
 #define ZEBRA_ZEBRA_NB_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern const struct frr_yang_module_info frr_zebra_info;
 
 /* prototypes */
@@ -485,4 +489,8 @@ struct yang_data *
 lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_weight_get_elem(
 	const char *xpath, const void *list_entry);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/zebra/zebra_nhg.h b/zebra/zebra_nhg.h
@@ -26,6 +26,10 @@
 #include "lib/nexthop.h"
 #include "lib/nexthop_group.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* This struct is used exclusively for dataplane
  * interaction via a dataplane context.
  *
@@ -269,4 +273,8 @@ extern void zebra_nhg_sweep_table(struct hash *hash);
 struct route_entry; /* Forward ref to avoid circular includes */
 extern int nexthop_active_update(struct route_node *rn, struct route_entry *re);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* __ZEBRA_NHG_H__ */
diff --git a/zebra/zebra_nhg_private.h b/zebra/zebra_nhg_private.h
@@ -30,6 +30,10 @@
 
 #include "zebra/zebra_nhg.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Abstraction for connected trees */
 struct nhg_connected {
 	struct nhg_connected_tree_item tree_item;
@@ -70,4 +74,8 @@ extern struct nhg_hash_entry *
 nhg_connected_tree_add_nhe(struct nhg_connected_tree_head *head,
 			   struct nhg_hash_entry *nhe);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ZEBRA_NHG_PRIVATE_H__ */