[XS] Change in osmo-bsc[master]: ipaccess-proxy: Fix wrong cb function passed

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38981?usp=email ) Change subject: ipaccess-proxy: Fix wrong cb function passed ...................................................................... ipaccess-proxy: Fix wrong cb function passed It makes no sense that ipaccess-proxy is using the ipaccess_fd_cb() function from libosmo-abis, since that function expects an e1_input ipaccess driver to be set up by the app, which ipaccess-proxy never sets up. Furthermore, even the data pointer being passed doesn't match the one expected by the callback. This seems to be a bug introduced 10 years ago in osmo-bsc.git eb623019382fdbff36fb8a72052732e225aef67e, where the name of the private function callback used by ipaccess-proxy was changed to proxy_ipaccess_fd_cb() to avoid colliding with the ipaccess_fd_cb() from libosmo-abis, but only 1 of the 2 references was changed at the time, leaving the other one pointing to the wrong function. Fixes: eb623019382fdbff36fb8a72052732e225aef67e Change-Id: I1702d9913a462a36e4b78b503a8338ae2ad140b1 --- M src/ipaccess/ipaccess-proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/38981/1 diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 7ede283..62e79cd 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1021,7 +1021,7 @@ } bfd = &ipc->fd; - osmo_fd_setup(bfd, ret, OSMO_FD_READ | OSMO_FD_WRITE, ipaccess_fd_cb, ipc, priv_nr); + osmo_fd_setup(bfd, ret, OSMO_FD_READ | OSMO_FD_WRITE, proxy_ipaccess_fd_cb, ipc, priv_nr); ret = setsockopt(bfd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (ret < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1702d9913a462a36e4b78b503a8338ae2ad140b1 Gerrit-Change-Number: 38981 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt;