pfcp: Support pfcp-peer-list

Initial support to fast restart mecanism. While restarting UPF function,
pfcp association are done. In basic mode of operations, pfcp association
are initiated by SMF, but it can delay bootstrap delay to the time
intiial association is setup. This extension make it faster by
initiating pfcp association to remote SMF if specified.

Signed-off-by: Alexandre Cassen <acassen@gmail.com>

Author: acassen

lib/command.h

@@ -57,6 +57,7 @@ enum node_type {
 	CDR_NODE,					/* CDR commands. */
 	GTP_PROXY_NODE,					/* GTP Proxy commands. */
 	GTP_ROUTER_NODE,				/* GTP Router commands. */
+	PFCP_PEER_LIST_NODE,				/* PFCP Peer List commands. */
 	PFCP_PROXY_NODE,				/* PFCP Proxy commands. */
 	PFCP_ROUTER_NODE,				/* PFCP Router commands. */
 

src/gtp_data.c

@@ -58,6 +58,7 @@ alloc_daemon_data(void)
 	INIT_LIST_HEAD(&new->gtp_cdr);
 	INIT_LIST_HEAD(&new->gtp_proxy_ctx);
 	INIT_LIST_HEAD(&new->gtp_router_ctx);
+	INIT_LIST_HEAD(&new->pfcp_peers);
 	INIT_LIST_HEAD(&new->pfcp_router_ctx);
 	gtp_bpf_progs_init();
 	pppoe_init();

src/include/gtp_data.h

@@ -53,6 +53,7 @@ struct data {
 	struct list_head	gtp_cdr;
 	struct list_head	gtp_proxy_ctx;
 	struct list_head	gtp_router_ctx;
+	struct list_head	pfcp_peers;;
 	struct list_head	pfcp_router_ctx;;
 
 	unsigned long		flags;

src/pfcp/include/pfcp_assoc.h

@@ -25,6 +25,7 @@
 #include "gtp_stddef.h"
 #include "pfcp_ie.h"
 #include "list_head.h"
+#include "addr.h"
 #include "vty.h"
 
 /* Hash table */

src/pfcp/include/pfcp_router.h

@@ -27,6 +27,7 @@
 #include "gtp_bpf_prog.h"
 
 #define PFCP_ROUTER_DELAYED	2
+#define PFCP_PEER_MAX		16
 
 enum pfcp_flags {
 	PFCP_ROUTER_FL_LISTEN,
@@ -71,7 +72,21 @@ struct pfcp_router {
 	struct list_head	next;
 };
 
+struct pfcp_peer_list {
+	char			name[GTP_NAME_MAX_LEN];
+	char			description[GTP_STR_MAX_LEN];
+	union addr		addr[PFCP_PEER_MAX];
+	int			nr_addr;
+
+	struct list_head	next;
+};
+
+
 /* Prototypes */
+struct pfcp_peer_list *pfcp_peer_list_get(const char *name);
+struct pfcp_peer_list *pfcp_peer_list_alloc(const char *name);
+void pfcp_peer_list_ctx_destroy(struct pfcp_peer_list *ctx);
+void pfcp_peer_list_destroy(void);
 int pfcp_gtpu_ingress_init(struct inet_server *srv);
 int pfcp_gtpu_ingress_process(struct inet_server *srv,
 			      struct sockaddr_storage *addr_from);

src/pfcp/pfcp.c

@@ -38,6 +38,7 @@ pfcp_init(void)
 int
 pfcp_destroy(void)
 {
+	pfcp_peer_list_destroy();
 	pfcp_assoc_destroy();
 	pfcp_router_destroy();
 	pfcp_sessions_destroy();

src/pfcp/pfcp_bpf.c

@@ -496,7 +496,7 @@ static struct gtp_bpf_prog_tpl pfcp_bpf_tpl = {
 };
 
 static void __attribute__((constructor))
-gtp_bpf_fwd_init(void)
+pfcp_bpf_init(void)
 {
 	gtp_bpf_prog_tpl_register(&pfcp_bpf_tpl);
 }

src/pfcp/pfcp_router.c

@@ -38,6 +38,58 @@ extern struct data *daemon_data;
 extern struct thread_master *master;
 
 
+/*
+ *	PFCP Peer utilities
+ */
+struct pfcp_peer_list *
+pfcp_peer_list_get(const char *name)
+{
+	struct pfcp_peer_list *p;
+	size_t len = strlen(name);
+
+	list_for_each_entry(p, &daemon_data->pfcp_peers, next) {
+		if (!strncmp(p->name, name, len))
+			return p;
+	}
+
+	return NULL;
+}
+
+struct pfcp_peer_list *
+pfcp_peer_list_alloc(const char *name)
+{
+	struct pfcp_peer_list *new;
+
+	PMALLOC(new);
+	if (!new) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	INIT_LIST_HEAD(&new->next);
+	bsd_strlcpy(new->name, name, GTP_NAME_MAX_LEN - 1);
+
+	list_add_tail(&new->next, &daemon_data->pfcp_peers);
+
+	return new;
+}
+
+void
+pfcp_peer_list_ctx_destroy(struct pfcp_peer_list *p)
+{
+	list_del(&p->next);
+	FREE(p);
+}
+
+void
+pfcp_peer_list_destroy(void)
+{
+	struct pfcp_peer_list *p, *_p;
+
+	list_for_each_entry_safe(p, _p, &daemon_data->pfcp_peers, next)
+		pfcp_peer_list_ctx_destroy(p);
+}
+
+
 /*
  *	Helpers
  */

src/pfcp/pfcp_router_vty.c

@@ -26,7 +26,7 @@
 #include "gtp_data.h"
 #include "gtp.h"
 #include "gtp_bpf_utils.h"
-#include "include/pfcp_router.h"
+#include "pfcp_router.h"
 #include "inet_server.h"
 #include "pfcp_assoc.h"
 #include "pfcp.h"
@@ -60,7 +60,7 @@ DEFUN(pfcp_router,
 	new = pfcp_router_get(argv[0]);
 	new = (new) ? : pfcp_router_alloc(argv[0]);
 	if (!new) {
-		vty_out(vty, "%% Error allocating pfcp-router:%s !!!%s"
+		vty_out(vty, "%% Error allocating pfcp-router:'%s' !!!%s"
 			   , argv[0], VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -86,7 +86,7 @@ DEFUN(no_pfcp_router,
 	/* Already existing ? */
 	c = pfcp_router_get(argv[0]);
 	if (!c) {
-		vty_out(vty, "%% unknown gtp-router %s%s", argv[0], VTY_NEWLINE);
+		vty_out(vty, "%% unknown pfcp-router:'%s'%s", argv[0], VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -455,6 +455,109 @@ DEFUN(show_pfcp_assoc,
 }
 
 
+/*
+ *	PFCP Peers command
+ */
+DEFUN(pfcp_peer_list,
+      pfcp_peer_list_cmd,
+      "pfcp-peer-list STRING",
+      "Configure PFCP Peer List\n"
+      "PFCP Peer list Name")
+{
+	struct pfcp_peer_list *new;
+
+	if (argc < 1) {
+		vty_out(vty, "%% missing arguments%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Already existing ? */
+	new = pfcp_peer_list_get(argv[0]);
+	new = (new) ? : pfcp_peer_list_alloc(argv[0]);
+	if (!new) {
+		vty_out(vty, "%% Error allocating pfcp-peer:'%s' !!!%s"
+			   , argv[0], VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	vty->node = PFCP_ROUTER_NODE;
+	vty->index = new;
+	return CMD_SUCCESS;
+}
+
+DEFUN(no_pfcp_peer_list,
+      no_pfcp_peer_list_cmd,
+      "no pfcp-peer-list STRING",
+      "Destroy PFCP Peer List\n"
+      "PFCP Peer list Name")
+{
+	struct pfcp_peer_list *p;
+
+	if (argc < 1) {
+		vty_out(vty, "%% missing arguments%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Already existing ? */
+	p = pfcp_peer_list_get(argv[0]);
+	if (!p) {
+		vty_out(vty, "%% unknown pfcp-peer:'%s'%s", argv[0], VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	pfcp_peer_list_ctx_destroy(p);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(pfcp_peer_list_desciption,
+      pfcp_peer_list_description_cmd,
+      "description STRING",
+      "Set PFCP Peer list description\n"
+      "description\n")
+{
+	struct pfcp_peer_list *p = vty->index;
+
+	snprintf(p->description, sizeof(p->description), "%s", argv[0]);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN(pfcp_peer,
+      pfcp_peer_cmd,
+      "peer STRING",
+      "Create a PFCP Peer\n"
+      "PFCP Peer")
+{
+	struct pfcp_peer_list *p = vty->index;
+	int err;
+
+	if (argc < 1) {
+		vty_out(vty, "%% missing arguments%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	err = addr_parse(argv[0], &p->addr[p->nr_addr]);
+	if (err) {
+		vty_out(vty, "%% invalid peer:'%s'%s", argv[0], VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	switch (p->addr[p->nr_addr].family) {
+	case AF_INET:
+		if (!p->addr[p->nr_addr].sin.sin_port)
+			p->addr[p->nr_addr].sin.sin_port = htons(PFCP_PORT);
+	case AF_INET6:
+		if (!p->addr[p->nr_addr].sin6.sin6_port)
+			p->addr[p->nr_addr].sin6.sin6_port = htons(PFCP_PORT);
+	}
+
+	p->nr_addr++;
+
+	return CMD_SUCCESS;
+}
+
+
 /* Show */
 DEFUN(show_pfcp_bpf,
       show_pfcp_bpf_cmd,
@@ -543,6 +646,30 @@ config_pfcp_router_write(struct vty *vty)
 	return CMD_SUCCESS;
 }
 
+static int
+config_pfcp_peer_list_write(struct vty *vty)
+{
+	struct list_head *l = &daemon_data->pfcp_peers;
+	struct pfcp_peer_list *p;
+	char addr_str[64];
+	int i;
+
+	list_for_each_entry(p, l, next) {
+		vty_out(vty, "pfcp-peer-list %s%s", p->name, VTY_NEWLINE);
+		if (p->description[0])
+			vty_out(vty, " description %s%s"
+				   , p->description, VTY_NEWLINE);
+		for (i = 0; i < p->nr_addr; i++) {
+			vty_out(vty, " peer %s%s"
+				   , addr_stringify(&p->addr[i], addr_str, sizeof(addr_str))
+				   , VTY_NEWLINE);
+		}
+
+	}
+
+	return 0;
+}
+
 
 /*
  *	VTY init
@@ -576,6 +703,21 @@ cmd_ext_pfcp_router_install(void)
 	return 0;
 }
 
+static int
+cmd_ext_pfcp_peer_install(void)
+{
+	/* Install PFCP Router commands. */
+	install_element(CONFIG_NODE, &pfcp_peer_list_cmd);
+	install_element(CONFIG_NODE, &no_pfcp_peer_list_cmd);
+
+	install_default(PFCP_PEER_LIST_NODE);
+	install_element(PFCP_PEER_LIST_NODE, &pfcp_peer_list_description_cmd);
+	install_element(PFCP_PEER_LIST_NODE, &pfcp_peer_cmd);
+
+	return 0;
+}
+
+
 struct cmd_node pfcp_router_node = {
 	.node = PFCP_ROUTER_NODE,
 	.parent_node = CONFIG_NODE,
@@ -588,8 +730,21 @@ static struct cmd_ext cmd_ext_pfcp_router = {
 	.install = cmd_ext_pfcp_router_install,
 };
 
+struct cmd_node pfcp_peer_list_node = {
+	.node = PFCP_PEER_LIST_NODE,
+	.parent_node = CONFIG_NODE,
+	.prompt ="%s(pfcp-peer-list)# ",
+	.config_write = config_pfcp_peer_list_write,
+};
+
+static struct cmd_ext cmd_ext_pfcp_peer_list = {
+	.node = &pfcp_peer_list_node,
+	.install = cmd_ext_pfcp_peer_install,
+};
+
 static void __attribute__((constructor))
 pfcp_router_vty_init(void)
 {
 	cmd_ext_register(&cmd_ext_pfcp_router);
+	cmd_ext_register(&cmd_ext_pfcp_peer_list);
 }