pespin has uploaded this change for review.

View Change

Rename tun_encaps -> tun_inject_pkt

The terminology of "encapsulating" used in tun_encaps is confusing,
since in this case we are not really encapsulating anything, but
actually delivering ("injecting") the packet to the system network
stack.
Using the "encapsulating" term is also confusing because readers may
think it may be doing the GTP-U encapsulation, which is not.

Change-Id: Ibb17c792b81668571e69d79918f3adf0e9e0f6c8
---
M ggsn/ggsn.c
M lib/tun.c
M lib/tun.h
M sgsnemu/sgsnemu.c
4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/08/38508/1

diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index 6b51bbc..062e542 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -815,7 +815,7 @@
 			osmo_hexdump(pack, len));
 		return -1;
 	}
-	return tun_encaps((struct tun_t *)pdp->ipif, pack, len);
+	return tun_inject_pkt((struct tun_t *)pdp->ipif, pack, len);
 }
 
 /* callback for libgtp osmocom select loop integration */
diff --git a/lib/tun.c b/lib/tun.c
index 5f73d32..3cce3a5 100644
--- a/lib/tun.c
+++ b/lib/tun.c
@@ -200,7 +200,7 @@
 	return 0;
 }
 
-int tun_encaps(struct tun_t *tun, void *pack, unsigned len)
+int tun_inject_pkt(struct tun_t *tun, void *pack, unsigned len)
 {
 	struct msgb *msg;
 	int rc;
diff --git a/lib/tun.h b/lib/tun.h
index a6b6181..4d41eb8 100644
--- a/lib/tun.h
+++ b/lib/tun.h
@@ -47,7 +47,7 @@
 
 extern int tun_new(struct tun_t **tun, const char *dev_name, bool use_kernel, int fd0, int fd1u);
 extern int tun_free(struct tun_t *tun);
-extern int tun_encaps(struct tun_t *tun, void *pack, unsigned len);
+extern int tun_inject_pkt(struct tun_t *tun, void *pack, unsigned len);
 
 extern int tun_addaddr(struct tun_t *this, struct in46_addr *addr, size_t prefixlen);
 
diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c
index c592aa9..d195fab 100644
--- a/sgsnemu/sgsnemu.c
+++ b/sgsnemu/sgsnemu.c
@@ -1827,7 +1827,7 @@
 	}
 
 	/*  printf("cb_gtpu_data_ind. Packet received: forwarding to tun\n"); */
-	return tun_encaps((struct tun_t *)pdp->ipif, pack, len);
+	return tun_inject_pkt((struct tun_t *)pdp->ipif, pack, len);
 }
 
 int main(int argc, char **argv)

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