Gitiles
Code Review Sign In
192.168.1.100 / T108 / e958203796650e3959a43708d67534bf36f4c83b / . / external / routing / quagga / patches / 200-gcc10.patch
blob: f3b0305b3dddac7f56a2ddcec1837c37342f40f3 [file] [log] [blame]
b.liue9582032025-04-17 19:18:16 +0800[diff] [blame^]1--- a/lib/prefix.h
2+++ b/lib/prefix.h
3@@ -44,7 +44,7 @@
4 */
5 struct ethaddr {
6 u_char octet[ETHER_ADDR_LEN];
7-} __packed;
8+} __attribute__((packed));
9
10
11 /*
12--- a/pimd/pim_version.h
13+++ b/pimd/pim_version.h
14@@ -25,6 +25,6 @@
15
16 #define PIMD_VERSION_STR "0.166"
17
18-const char * const PIMD_VERSION;
19+extern const char * const PIMD_VERSION;
20
21 #endif /* PIM_VERSION_H */
22--- a/pimd/pimd.h
23+++ b/pimd/pimd.h
24@@ -68,39 +68,39 @@
25 #define PIM_MASK_PIM_J_P (1 << 12)
26 #define PIM_MASK_STATIC (1 << 13)
27
28-const char *const PIM_ALL_SYSTEMS;
29-const char *const PIM_ALL_ROUTERS;
30-const char *const PIM_ALL_PIM_ROUTERS;
31-const char *const PIM_ALL_IGMP_ROUTERS;
32-
33-struct thread_master *master;
34-uint32_t qpim_debugs;
35-int qpim_mroute_socket_fd;
36-int64_t qpim_mroute_socket_creation; /* timestamp of creation */
37-struct thread *qpim_mroute_socket_reader;
38-int qpim_mroute_oif_highest_vif_index;
39-struct list *qpim_channel_oil_list; /* list of struct channel_oil */
40-struct in_addr qpim_all_pim_routers_addr;
41-int qpim_t_periodic; /* Period between Join/Prune Messages */
42-struct list *qpim_upstream_list; /* list of struct pim_upstream */
43-struct zclient *qpim_zclient_update;
44-struct zclient *qpim_zclient_lookup;
45-struct pim_assert_metric qpim_infinite_assert_metric;
46-long qpim_rpf_cache_refresh_delay_msec;
47-struct thread *qpim_rpf_cache_refresher;
48-int64_t qpim_rpf_cache_refresh_requests;
49-int64_t qpim_rpf_cache_refresh_events;
50-int64_t qpim_rpf_cache_refresh_last;
51-struct in_addr qpim_inaddr_any;
52-struct list *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
53-struct in_addr qpim_ssmpingd_group_addr;
54-int64_t qpim_scan_oil_events;
55-int64_t qpim_scan_oil_last;
56-int64_t qpim_mroute_add_events;
57-int64_t qpim_mroute_add_last;
58-int64_t qpim_mroute_del_events;
59-int64_t qpim_mroute_del_last;
60-struct list *qpim_static_route_list; /* list of routes added statically */
61+extern const char *const PIM_ALL_SYSTEMS;
62+extern const char *const PIM_ALL_ROUTERS;
63+extern const char *const PIM_ALL_PIM_ROUTERS;
64+extern const char *const PIM_ALL_IGMP_ROUTERS;
65+
66+extern struct thread_master *master;
67+extern uint32_t qpim_debugs;
68+extern int qpim_mroute_socket_fd;
69+extern int64_t qpim_mroute_socket_creation; /* timestamp of creation */
70+extern struct thread *qpim_mroute_socket_reader;
71+extern int qpim_mroute_oif_highest_vif_index;
72+extern struct list *qpim_channel_oil_list; /* list of struct channel_oil */
73+static struct in_addr qpim_all_pim_routers_addr;
74+extern int qpim_t_periodic; /* Period between Join/Prune Messages */
75+extern struct list *qpim_upstream_list; /* list of struct pim_upstream */
76+extern struct zclient *qpim_zclient_update;
77+extern struct zclient *qpim_zclient_lookup;
78+extern struct pim_assert_metric qpim_infinite_assert_metric;
79+extern long qpim_rpf_cache_refresh_delay_msec;
80+extern struct thread *qpim_rpf_cache_refresher;
81+extern int64_t qpim_rpf_cache_refresh_requests;
82+extern int64_t qpim_rpf_cache_refresh_events;
83+extern int64_t qpim_rpf_cache_refresh_last;
84+extern struct in_addr qpim_inaddr_any;
85+extern struct list *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
86+extern struct in_addr qpim_ssmpingd_group_addr;
87+extern int64_t qpim_scan_oil_events;
88+extern int64_t qpim_scan_oil_last;
89+extern int64_t qpim_mroute_add_events;
90+extern int64_t qpim_mroute_add_last;
91+extern int64_t qpim_mroute_del_events;
92+extern int64_t qpim_mroute_del_last;
93+extern struct list *qpim_static_route_list; /* list of routes added statically */
94
95 #define PIM_JP_HOLDTIME (qpim_t_periodic * 7 / 2)
96