---
bgpd/bgp_encap.c | 45 ---------------------------------------------
bgpd/bgp_mplsvpn.c | 8 ++++----
bgpd/bgp_mplsvpn.h | 4 ++++
3 files changed, 8 insertions(+), 49 deletions(-)
diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c
index d21924c..bd150ce 100644
--- a/bgpd/bgp_encap.c
+++ b/bgpd/bgp_encap.c
@@ -49,51 +49,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA
#include "rfapi_backend.h"
#endif
-static u_int16_t
-decode_rd_type (u_char *pnt)
-{
- u_int16_t v;
-
- v = ((u_int16_t) *pnt++ << 8);
- v |= (u_int16_t) *pnt;
- return v;
-}
-
-
-static void
-decode_rd_as (u_char *pnt, struct rd_as *rd_as)
-{
- rd_as->as = (u_int16_t) *pnt++ << 8;
- rd_as->as |= (u_int16_t) *pnt++;
-
- rd_as->val = ((u_int32_t) *pnt++) << 24;
- rd_as->val |= ((u_int32_t) *pnt++) << 16;
- rd_as->val |= ((u_int32_t) *pnt++) << 8;
- rd_as->val |= (u_int32_t) *pnt;
-}
-
-static void
-decode_rd_as4 (u_char *pnt, struct rd_as *rd_as)
-{
- rd_as->as = (u_int32_t) *pnt++ << 24;
- rd_as->as |= (u_int32_t) *pnt++ << 16;
- rd_as->as |= (u_int32_t) *pnt++ << 8;
- rd_as->as |= (u_int32_t) *pnt++;
-
- rd_as->val = ((u_int32_t) *pnt++ << 8);
- rd_as->val |= (u_int32_t) *pnt;
-}
-
-static void
-decode_rd_ip (u_char *pnt, struct rd_ip *rd_ip)
-{
- memcpy (&rd_ip->ip, pnt, 4);
- pnt += 4;
-
- rd_ip->val = ((u_int16_t) *pnt++ << 8);
- rd_ip->val |= (u_int16_t) *pnt;
-}
-
static void
ecom2prd(struct ecommunity *ecom, struct prefix_rd *prd)
{
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index ec64300..ff33e42 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -39,7 +39,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA
#include "rfapi_backend.h"
#endif
-static u_int16_t
+u_int16_t
decode_rd_type (u_char *pnt)
{
u_int16_t v;
@@ -80,7 +80,7 @@ encode_label(u_int32_t label,
}
/* type == RD_TYPE_AS */
-static void
+void
decode_rd_as (u_char *pnt, struct rd_as *rd_as)
{
rd_as->as = (u_int16_t) *pnt++ << 8;
@@ -93,7 +93,7 @@ decode_rd_as (u_char *pnt, struct rd_as *rd_as)
}
/* type == RD_TYPE_AS4 */
-static void
+void
decode_rd_as4 (u_char *pnt, struct rd_as *rd_as)
{
rd_as->as = (u_int32_t) *pnt++ << 24;
@@ -106,7 +106,7 @@ decode_rd_as4 (u_char *pnt, struct rd_as *rd_as)
}
/* type == RD_TYPE_IP */
-static void
+void
decode_rd_ip (u_char *pnt, struct rd_ip *rd_ip)
{
memcpy (&rd_ip->ip, pnt, 4);
diff --git a/bgpd/bgp_mplsvpn.h b/bgpd/bgp_mplsvpn.h
index ba65ca7..2210537 100644
--- a/bgpd/bgp_mplsvpn.h
+++ b/bgpd/bgp_mplsvpn.h
@@ -69,10 +69,14 @@ struct rd_ip
u_int16_t val;
};
+extern u_int16_t decode_rd_type (u_char *);
extern void bgp_mplsvpn_init (void);
extern int bgp_nlri_parse_vpn (struct peer *, struct attr *, struct bgp_nlri
*);
extern u_int32_t decode_label (u_char *);
extern void encode_label(u_int32_t, u_char *);
+extern void decode_rd_as (u_char *, struct rd_as *);
+extern void decode_rd_as4 (u_char *, struct rd_as *);
+extern void decode_rd_ip (u_char *, struct rd_ip *);
extern int str2prefix_rd (const char *, struct prefix_rd *);
extern int str2tag (const char *, u_char *);
extern char *prefix_rd2str (struct prefix_rd *, char *, size_t);
--
2.1.3
_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev
