neels has uploaded this change for review.

View Change

cosmetic: rename upf_gtp_tun_desc to upf_gtp_tunend_desc

Change-Id: I0815012679237838a031e28c0afb98b7e0d184bd
---
M include/osmocom/upf/up_gtp_action.h
M include/osmocom/upf/upf_gtp.h
M src/osmo-upf/upf_gtp.c
3 files changed, 12 insertions(+), 12 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/35/30235/1

diff --git a/include/osmocom/upf/up_gtp_action.h b/include/osmocom/upf/up_gtp_action.h
index 5b4d5ee..8e291b7 100644
--- a/include/osmocom/upf/up_gtp_action.h
+++ b/include/osmocom/upf/up_gtp_action.h
@@ -54,7 +54,7 @@
 	enum up_gtp_action_kind kind;
 	union {
 		/* En-/De-capsulate GTP: add/remove a GTP header and forward the GTP payload from/to plain IP. */
-		struct upf_gtp_tun_desc tunend;
+		struct upf_gtp_tunend_desc tunend;
 
 		/* Tunnel-map GTP: translate from one TEID to another and forward */
 		struct upf_nft_tunmap_desc tunmap;
diff --git a/include/osmocom/upf/upf_gtp.h b/include/osmocom/upf/upf_gtp.h
index 1e0df5e..ed4c5f8 100644
--- a/include/osmocom/upf/upf_gtp.h
+++ b/include/osmocom/upf/upf_gtp.h
@@ -60,14 +60,14 @@
 	struct llist_head tunnels;
 };
 
-struct upf_gtp_tun_desc {
+struct upf_gtp_tunend_desc {
 	uint32_t local_teid;
 	uint32_t remote_teid;
 	struct osmo_sockaddr ue_addr;
 	struct osmo_sockaddr gtp_remote_addr;
 };
 
-int upf_gtp_tun_desc_cmp(const struct upf_gtp_tun_desc *a, const struct upf_gtp_tun_desc *b);
+int upf_gtp_tun_desc_cmp(const struct upf_gtp_tunend_desc *a, const struct upf_gtp_tunend_desc *b);
 
 int upf_gtp_genl_ensure_open();
 void upf_gtp_genl_close();
@@ -77,9 +77,9 @@
 struct upf_gtp_dev *upf_gtp_dev_find_by_name(const char *name);
 struct upf_gtp_dev *upf_gtp_dev_first();
 
-int upf_gtp_dev_tunnel_add(struct upf_gtp_dev *dev, const struct upf_gtp_tun_desc *t);
-bool upf_gtp_dev_is_tunnel_active(struct upf_gtp_dev *dev, const struct upf_gtp_tun_desc *t);
-int upf_gtp_dev_tunnel_del(struct upf_gtp_dev *dev, const struct upf_gtp_tun_desc *t);
+int upf_gtp_dev_tunnel_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t);
+bool upf_gtp_dev_is_tunnel_active(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t);
+int upf_gtp_dev_tunnel_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t);
 
 int upf_gtp_dev_to_str_buf(char *buf, size_t buflen, const struct upf_gtp_dev *dev);
 char *upf_gtp_dev_to_str_c(void *ctx, const struct upf_gtp_dev *dev);
diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c
index 880e587..c99788a 100644
--- a/src/osmo-upf/upf_gtp.c
+++ b/src/osmo-upf/upf_gtp.c
@@ -291,7 +291,7 @@
 	struct llist_head entry;
 
 	struct upf_gtp_dev *dev;
-	struct upf_gtp_tun_desc desc;
+	struct upf_gtp_tunend_desc desc;
 	bool active;
 };
 
@@ -322,7 +322,7 @@
 	return 0;
 }
 
-static struct upf_gtp_tun *upf_gtp_tun_alloc(struct upf_gtp_dev *dev, const struct upf_gtp_tun_desc *desc)
+static struct upf_gtp_tun *upf_gtp_tun_alloc(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *desc)
 {
 	struct upf_gtp_tun *tun = talloc(dev, struct upf_gtp_tun);
 	OSMO_ASSERT(tun);
@@ -381,7 +381,7 @@
 	return rc;
 }
 
-static struct upf_gtp_tun *upf_gtp_dev_tunnel_find(struct upf_gtp_dev *dev, const struct upf_gtp_tun_desc *tun_desc)
+static struct upf_gtp_tun *upf_gtp_dev_tunnel_find(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc)
 {
 	struct upf_gtp_tun *tun;
 	llist_for_each_entry(tun, &dev->tunnels, entry) {
@@ -392,7 +392,7 @@
 	return NULL;
 }
 
-int upf_gtp_dev_tunnel_add(struct upf_gtp_dev *dev, const struct upf_gtp_tun_desc *tun_desc)
+int upf_gtp_dev_tunnel_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc)
 {
 	struct upf_gtp_tun *tun;
 	tun = upf_gtp_dev_tunnel_find(dev, tun_desc);
@@ -403,7 +403,7 @@
 	return upf_gtp_tun_activate(tun);
 }
 
-int upf_gtp_dev_tunnel_del(struct upf_gtp_dev *dev, const struct upf_gtp_tun_desc *tun_desc)
+int upf_gtp_dev_tunnel_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc)
 {
 	struct upf_gtp_tun *tun;
 	int rc;
@@ -458,7 +458,7 @@
 	return 0;
 }
 
-int upf_gtp_tun_desc_cmp(const struct upf_gtp_tun_desc *a, const struct upf_gtp_tun_desc *b)
+int upf_gtp_tun_desc_cmp(const struct upf_gtp_tunend_desc *a, const struct upf_gtp_tunend_desc *b)
 {
 	int r;
 

To view, visit change 30235. To unsubscribe, or for help writing mail filters, visit settings.