Change in osmo-hnodeb[master]: WIP: gtp

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26545 )


Change subject: WIP: gtp
......................................................................

WIP: gtp

Change-Id: I019e57c693577a1836e1676146ac03bc3edd7e9c
---
M include/osmocom/hnodeb/hnodeb.h
M src/osmo-hnodeb/gtp.c
M src/osmo-hnodeb/hnb.c
3 files changed, 2 insertions(+), 29 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/45/26545/1

diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h
index 37bf7d5..52d1bec 100644
--- a/include/osmocom/hnodeb/hnodeb.h
+++ b/include/osmocom/hnodeb/hnodeb.h
@@ -115,8 +115,6 @@
 		char *cfg_local_addr;
 		struct osmo_sockaddr local_addr;
 		struct gsn_t *gsn;
-		struct osmo_fd fd0;
-		struct osmo_fd fd1c;
 		struct osmo_fd fd1u;
 	} gtp;
 
diff --git a/src/osmo-hnodeb/gtp.c b/src/osmo-hnodeb/gtp.c
index 2368270..4695ea9 100644
--- a/src/osmo-hnodeb/gtp.c
+++ b/src/osmo-hnodeb/gtp.c
@@ -74,12 +74,6 @@
 
 	switch (fd->priv_nr) {
 	case 0:
-		rc = gtp_decaps0(hnb->gtp.gsn);
-		break;
-	case 1:
-		rc = gtp_decaps1c(hnb->gtp.gsn);
-		break;
-	case 2:
 		rc = gtp_decaps1u(hnb->gtp.gsn);
 		break;
 	default:
@@ -109,18 +103,10 @@
 	rc = sk_get_bound_addr(gsn->fd1u, &hnb->gtp.local_addr);
 	if (rc < 0) {
 		LOGP(DGTP, LOGL_ERROR, "Failed to get GTP-U socket bound address: %s\n", strerror(-rc));
-		return rc;
+		goto free_ret;
 	}
 
-	osmo_fd_setup(&hnb->gtp.fd0, gsn->fd0, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 0);
-	if ((rc = osmo_fd_register(&hnb->gtp.fd0)) < 0)
-		goto free_ret;
-
-	osmo_fd_setup(&hnb->gtp.fd1c, gsn->fd1c, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 1);
-	if ((rc = osmo_fd_register(&hnb->gtp.fd1c)) < 0)
-		goto free_ret;
-
-	osmo_fd_setup(&hnb->gtp.fd1u, gsn->fd1u, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 2);
+	osmo_fd_setup(&hnb->gtp.fd1u, gsn->fd1u, OSMO_FD_READ, hnb_gtp_fd_cb, hnb, 0);
 	if ((rc = osmo_fd_register(&hnb->gtp.fd1u)) < 0)
 		goto free_ret;
 
@@ -130,12 +116,7 @@
 	return 0;
 
 free_ret:
-	osmo_fd_unregister(&hnb->gtp.fd1u);
-	osmo_fd_unregister(&hnb->gtp.fd1c);
-	osmo_fd_unregister(&hnb->gtp.fd0);
 	gtp_free(gsn);
-	hnb->gtp.fd0.fd = -1;
-	hnb->gtp.fd1c.fd = -1;
 	hnb->gtp.fd1u.fd = -1;
 	return rc;
 }
@@ -143,12 +124,8 @@
 void hnb_gtp_unbind(struct hnb *hnb)
 {
 	osmo_fd_unregister(&hnb->gtp.fd1u);
-	osmo_fd_unregister(&hnb->gtp.fd1c);
-	osmo_fd_unregister(&hnb->gtp.fd0);
 	gtp_free(hnb->gtp.gsn);
 	hnb->gtp.gsn = NULL;
-	hnb->gtp.fd0.fd = -1;
-	hnb->gtp.fd1c.fd = -1;
 	hnb->gtp.fd1u.fd = -1;
 }
 
diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c
index 5710ab4..b733d15 100644
--- a/src/osmo-hnodeb/hnb.c
+++ b/src/osmo-hnodeb/hnb.c
@@ -61,8 +61,6 @@
 	hnb->rtp.priority = -1;
 
 	hnb->gtp.cfg_local_addr = talloc_strdup(hnb, "0.0.0.0");
-	hnb->gtp.fd0.fd = -1;
-	hnb->gtp.fd1c.fd = -1;
 	hnb->gtp.fd1u.fd = -1;
 
 	hnb->shutdown_fi = osmo_fsm_inst_alloc(&hnb_shutdown_fsm, hnb, hnb,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26545
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hnodeb
Gerrit-Branch: master
Gerrit-Change-Id: I019e57c693577a1836e1676146ac03bc3edd7e9c
Gerrit-Change-Number: 26545
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211213/c840333f/attachment.htm>