- gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: socket: Add remote PID and local FD to AF_UNIX sockname
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36242?usp=email ) Change subject: socket: Add remote PID and local FD to AF_UNIX sockname ...................................................................... socket: Add remote PID and local FD to AF_UNIX sockname This allows identifying precisely an AF_UNIX socket. Change-Id: Ic465e557ea49de8e044d1ef6d91fc3c852c88ff2 --- M src/core/socket.c 1 file changed, 39 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/socket.c b/src/core/socket.c index f56dbf3..80a9d0e 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -26,6 +26,7 @@ * \file socket.c */ #ifdef HAVE_SYS_SOCKET_H +#define _GNU_SOURCE /* for struct ucred on glibc >= 2.8 */ #include <osmocom/core/logging.h> #include <osmocom/core/select.h> @@ -2137,8 +2138,6 @@ */ int osmo_sock_get_name_buf(char *str, size_t str_len, int fd) { - char hostbuf_l[INET6_ADDRSTRLEN], hostbuf_r[INET6_ADDRSTRLEN]; - char portbuf_l[6], portbuf_r[6]; struct osmo_strbuf sb = { .buf = str, .len = str_len }; struct osmo_sockaddr osa; struct sockaddr_un *sun; @@ -2161,6 +2160,10 @@ switch (osa.u.sa.sa_family) { case AF_INET: case AF_INET6: + { + char hostbuf_l[INET6_ADDRSTRLEN], hostbuf_r[INET6_ADDRSTRLEN]; + char portbuf_l[6], portbuf_r[6]; + len = sizeof(osa.u.sas); rc = getnameinfo(&osa.u.sa, len, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), @@ -2186,12 +2189,34 @@ } OSMO_STRBUF_PRINTF(sb, "r=%s:%s<->l=%s:%s", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); return sb.chars_needed; + } case AF_UNIX: + { + unsigned long long remote_pid; + bool have_remote_pid; +#if defined(SO_PEERCRED) + struct ucred ucred; + len = sizeof(struct ucred); + if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == -1) { + have_remote_pid = false; + } else { + have_remote_pid = true; + remote_pid = (unsigned long long)ucred.pid; + } +#else + #pragma message "SO_PEERCRED not available" + have_remote_pid = false; +#endif /* Make sure sun_path is NULL terminated: */ sun = (struct sockaddr_un *)&osa.u.sa; sun->sun_path[sizeof(sun->sun_path) - 1] = '\0'; - OSMO_STRBUF_PRINTF(sb, "%s:%d", sun->sun_path, fd); + if (have_remote_pid) + OSMO_STRBUF_PRINTF(sb, "r=%llu<->", remote_pid); + else + OSMO_STRBUF_PRINTF(sb, "r=NULL<->"); + OSMO_STRBUF_PRINTF(sb, "l=%s:%d", sun->sun_path, fd); return sb.chars_needed; + } default: osmo_strlcpy(str, "<socket-family-no-supported>", str_len); return -ENOTSUP; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36242?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic465e557ea49de8e044d1ef6d91fc3c852c88ff2 Gerrit-Change-Number: 36242 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: socket: Add remote PID and local FD to AF_UNIX sockname
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36242?usp=email ) Change subject: socket: Add remote PID and local FD to AF_UNIX sockname ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36242?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic465e557ea49de8e044d1ef6d91fc3c852c88ff2 Gerrit-Change-Number: 36242 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:34:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: trxcon: fix prim_compose_mr(): indicate proper tn
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36253?usp=email ) Change subject: trxcon: fix prim_compose_mr(): indicate proper tn ...................................................................... trxcon: fix prim_compose_mr(): indicate proper tn Change-Id: I0046f9c103bcb9207f0c2643c6a806bd56553d77 --- M src/host/trxcon/src/sched_prim.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 111c5f1..67be75e 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -94,7 +94,7 @@ prim = l1sched_prim_from_msgb(msg); prim->data_req = (struct l1sched_prim_chdr) { - .chan_nr = l1sched_lchan_desc[lchan->type].chan_nr, + .chan_nr = l1sched_lchan_desc[lchan->type].chan_nr | lchan->ts->index, .link_id = L1SCHED_CH_LID_SACCH, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36253?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0046f9c103bcb9207f0c2643c6a806bd56553d77 Gerrit-Change-Number: 36253 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: trxcon: fix hex formatting in prim_enqeue()
by laforge 13 Mar '24

13 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36252?usp=email ) Change subject: trxcon: fix hex formatting in prim_enqeue() ...................................................................... trxcon: fix hex formatting in prim_enqeue() Change-Id: I78c310bd9cc5d69bbeca575ebf4a480f16971e93 --- M src/host/trxcon/src/sched_prim.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 1baa125..111c5f1 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -368,7 +368,7 @@ if (OSMO_UNLIKELY(lchan == NULL || !lchan->active)) { LOGP_SCHEDD(sched, LOGL_ERROR, "No [active] lchan for primitive " L1SCHED_PRIM_STR_FMT " " - "(fn=%u, chan_nr=%02x, link_id=%02x, len=%u): %s\n", + "(fn=%u, chan_nr=0x%02x, link_id=0x%02x, len=%u): %s\n", L1SCHED_PRIM_STR_ARGS(prim), chdr->frame_nr, chdr->chan_nr, chdr->link_id, msgb_l2len(msg), msgb_hexdump_l2(msg)); @@ -378,7 +378,7 @@ LOGP_LCHAND(lchan, LOGL_DEBUG, "Enqueue primitive " L1SCHED_PRIM_STR_FMT " " - "(fn=%u, chan_nr=%02x, link_id=%02x, len=%u): %s\n", + "(fn=%u, chan_nr=0x%02x, link_id=0x%02x, len=%u): %s\n", L1SCHED_PRIM_STR_ARGS(prim), chdr->frame_nr, chdr->chan_nr, chdr->link_id, msgb_l2len(msg), msgb_hexdump_l2(msg)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36252?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I78c310bd9cc5d69bbeca575ebf4a480f16971e93 Gerrit-Change-Number: 36252 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: trxcon: fix prim_compose_mr(): indicate proper tn
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36253?usp=email ) Change subject: trxcon: fix prim_compose_mr(): indicate proper tn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36253?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0046f9c103bcb9207f0c2643c6a806bd56553d77 Gerrit-Change-Number: 36253 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:34:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_deregister_permanent_termination
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36233?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_deregister_permanent_termination ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36233?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I50daa7a04e0f19dbf987a8baba7a979a353089a3 Gerrit-Change-Number: 36233 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:34:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: fixeria, lynxis lazus, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5bf7708d11421710f3a88669d94c4f01060cdd6 Gerrit-Change-Number: 36230 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:33:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: jenkins.sh: use available Makefile, clean before building
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36264?usp=email ) Change subject: jenkins.sh: use available Makefile, clean before building ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36264?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Id3f2d71c184cf387fa178d5138d401686a8d0a63 Gerrit-Change-Number: 36264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:33:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Fix format error in log line
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?usp=email ) Change subject: gsup_server: Fix format error in log line ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4c724a65e49fc8bcaad7598fc07f3ddcbc9fa35f Gerrit-Change-Number: 36261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:32:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Fix order of params in stop_and_reply
by laforge 13 Mar '24

13 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?usp=email ) Change subject: epdg_ue_fsm: Fix order of params in stop_and_reply ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36260?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Icd058466463d215f4028d302cd45041e5627b459 Gerrit-Change-Number: 36260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 21:32:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log