Merge branch 'rfc4760' into fdn-mods

bgp.h

@@ -43,11 +43,51 @@ struct bgp_data_open {
     char opt_params[sizeof(((struct bgp_packet *)0)->data) - BGP_DATA_OPEN_SIZE]; /* variable */
 } __attribute__ ((packed));
 
+struct bgp_opt_param {
+    uint8_t type;
+    uint8_t len;
+#define BGP_MAX_OPT_PARAM_SIZE	256
+    char value[BGP_MAX_OPT_PARAM_SIZE];
+} __attribute__ ((packed));
+
+#define BGP_PARAM_TYPE_CAPABILITY	2
+struct bgp_capability {
+    uint8_t code;
+    uint8_t len;
+#define BGP_MAX_CAPABILITY_SIZE	256
+    char value[BGP_MAX_CAPABILITY_SIZE];
+} __attribute__ ((packed));
+
+/* RFC4760 Multiprotocol extension */
+#define BGP_CAP_CODE_MP	1
+
+struct bgp_mp_cap_param {
+    uint16_t afi; /* sa_family_t */
+    uint8_t reserved; /* SHOULD be 0 */
+    uint8_t safi;
+} __attribute__ ((packed));
+
+/* bgp_mp_cap_param.afi */
+#define BGP_MP_AFI_RESERVED	0
+#define BGP_MP_AFI_IPv4		1
+#define BGP_MP_AFI_IPv6		2
+/* bgp_mp_cap_param.safi */
+#define BGP_MP_SAFI_UNICAST	1
+#define BGP_MP_SAFI_MULTICAST	2
+
+struct bgp_ip6_prefix {
+    uint8_t len;
+    uint8_t prefix[16]; /* variable */
+} __attribute__ ((packed));
+
+/* end of RFC4760 specific definitions */
+
 struct bgp_ip_prefix {
     uint8_t len;
     uint32_t prefix; /* variable */
 } __attribute__ ((packed));
 
+/* works for both IPv4 and IPv6 prefixes */
 #define BGP_IP_PREFIX_SIZE(p) (1 + ((p).len / 8) + ((p).len % 8 != 0))
 
 struct bgp_path_attr {
@@ -65,6 +105,22 @@ struct bgp_path_attr {
     } data; /* variable */
 } __attribute__ ((packed));
 
+struct bgp_attr_mp_reach_nlri_partial {
+    uint16_t afi; /* sa_family_t */
+    uint8_t safi;
+    uint8_t next_hop_len;
+    uint8_t next_hop[16];
+    uint8_t reserved;
+} __attribute__ ((packed));
+#define BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE (3 + sizeof(struct bgp_attr_mp_reach_nlri_partial))
+
+struct bgp_attr_mp_unreach_nlri_partial {
+    uint16_t afi; /* sa_family_t */
+    uint8_t safi;
+} __attribute__ ((packed));
+/* we use it as an extended attribute */
+#define BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE (4 + sizeof(struct bgp_attr_mp_unreach_nlri_partial))
+
 /* bgp_path_attr.flags (bitfields) */
 #define BGP_PATH_ATTR_FLAG_OPTIONAL	(1 << 7)
 #define BGP_PATH_ATTR_FLAG_TRANS	(1 << 6)
@@ -85,9 +141,11 @@ struct bgp_path_attr {
 #define BGP_PATH_ATTR_CODE_ATOMIC_AGGREGATE	6	/* well-known, discretionary */
 #define BGP_PATH_ATTR_CODE_AGGREGATOR		7	/* optional, transitive */
 #define BGP_PATH_ATTR_CODE_COMMUNITIES		8	/* optional, transitive (RFC1997) */
+#define BGP_PATH_ATTR_CODE_MP_REACH_NLRI	14	/* optional, non-transitive (RFC4760) */
+#define BGP_PATH_ATTR_CODE_MP_UNREACH_NLRI	15	/* optional, non-transitive (RFC4760) */
 
 #define BGP_PATH_ATTR_SIZE(p) ((((p).flags & BGP_PATH_ATTR_FLAG_EXTLEN) \
-    ? ((p).data.e.len + 1) : (p).data.s.len) + 3)
+    ? ((p).data.e.len + 4) : (p).data.s.len) + 3)
 
 /* well known COMMUNITIES */
 #define BGP_COMMUNITY_NO_EXPORT			0xffffff01	/* don't advertise outside confederation */
@@ -101,6 +159,7 @@ struct bgp_data_notification {
 } __attribute__ ((packed));
 
 /* bgp_data_notification.error_code, .error_subcode */
+#define BGP_ERR_UNSPEC			0
 #define BGP_ERR_HEADER			1
 #  define BGP_ERR_HDR_NOT_SYNC		  1
 #  define BGP_ERR_HDR_BAD_LEN		  2
@@ -112,6 +171,7 @@ struct bgp_data_notification {
 #  define BGP_ERR_OPN_UNSUP_PARAM	  4
 #  define BGP_ERR_OPN_AUTH_FAILURE	  5
 #  define BGP_ERR_OPN_HOLD_TIME		  6
+#  define BGP_ERR_OPN_UNSUP_CAP		  7
 #define BGP_ERR_UPDATE			3
 #  define BGP_ERR_UPD_BAD_ATTR_LIST	  1
 #  define BGP_ERR_UPD_UNKN_WK_ATTR	  2
@@ -138,6 +198,11 @@ enum bgp_state {
     Established,			/* established */
 };
 
+struct bgp_route6_list {
+    struct bgp_ip6_prefix dest;
+    struct bgp_route6_list *next;
+};
+
 struct bgp_route_list {
     struct bgp_ip_prefix dest;
     struct bgp_route_list *next;
@@ -148,6 +213,12 @@ struct bgp_buf {
     size_t done;			/* bytes sent/recvd */
 };
 
+enum bgp_mp_handling {
+    HandleIPv6Routes,
+    DoesntHandleIPv6Routes,
+    HandlingUnknown,
+};
+
 /* state */
 struct bgp_peer {
     char name[32];			/* peer name */
@@ -174,8 +245,14 @@ struct bgp_peer {
     int cli_flag;			/* updates requested from CLI */
     char *path_attrs;			/* path attrs to send in UPDATE message */
     int path_attr_len;			/* length of path attrs */
+    int path_attr_len_without_nexthop;	/* length of path attrs  without NEXT_HOP */
     uint32_t events;			/* events to poll */
     struct event_data edata;		/* poll data */
+    enum bgp_mp_handling mp_handling;	/* how it handles IPv6 routes advertisements */
+    int update_routes6;			/* UPDATE required for IPv6 routes */
+    struct bgp_route6_list *routes6;	/* IPv6 routes known by this peer */
+    char mp_reach_nlri_partial[BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE];
+    char mp_unreach_nlri_partial[BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE];
 };
 
 /* bgp_peer.cli_flag */
@@ -195,7 +272,9 @@ void bgp_stop(struct bgp_peer *peer);
 void bgp_halt(struct bgp_peer *peer);
 int bgp_restart(struct bgp_peer *peer);
 int bgp_add_route(in_addr_t ip, in_addr_t mask);
+int bgp_add_route6(struct in6_addr ip, int prefixlen);
 int bgp_del_route(in_addr_t ip, in_addr_t mask);
+int bgp_del_route6(struct in6_addr ip, int prefixlen);
 void bgp_enable_routing(int enable);
 int bgp_set_poll(void);
 int bgp_process(uint32_t events[]);