summaryrefslogtreecommitdiffstats
path: root/src/gb
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-03-18 18:27:00 +0100
committerHarald Welte <laforge@gnumonks.org>2019-04-03 18:03:14 +0200
commit4a62eda225ab7f3c9556990c81a6fc5e19b5eec8 (patch)
tree5eab6ad641d4411ff31a15a51f6d0c14bccdb6f3 /src/gb
parent98ed3393cdfdf35ad0bb79f454474f2b27bf3d56 (diff)
Add _buf() functions to bypass static string buffers
We have a number of static buffers in use in libosmo*. This means the related functions are not usable in a thread-safe way. While we so far don't have many multi-threaded programs in the osmocom universe, the static buffers also prevent us from calling the same e.g. string-ify function twice within a single printf() call. Let's make sure there's an alternative function in all those cases, where the user can pass in a caller-allocated buffer + size, and make the 'classic' function with the static buffer a wrapper around that _buf() variant. Change-Id: Ibf85f79e93244f53b2684ff6f1095c5b41203e05
Diffstat (limited to 'src/gb')
-rw-r--r--src/gb/gprs_ns.c16
-rw-r--r--src/gb/libosmogb.map1
2 files changed, 11 insertions, 6 deletions
diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index c7ff78ed..fc120cec 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -1525,17 +1525,15 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg,
return rc;
}
-const char *gprs_ns_ll_str(const struct gprs_nsvc *nsvc)
+char *gprs_ns_ll_str_buf(char *buf, size_t buf_len, const struct gprs_nsvc *nsvc)
{
- static char buf[80];
-
switch(nsvc->ll) {
case GPRS_NS_LL_UDP:
- snprintf(buf, sizeof(buf), "%s:%u",
+ snprintf(buf, buf_len, "%s:%u",
inet_ntoa(nsvc->ip.bts_addr.sin_addr), osmo_ntohs(nsvc->ip.bts_addr.sin_port));
break;
case GPRS_NS_LL_FR_GRE:
- snprintf(buf, sizeof(buf), "%s:%u",
+ snprintf(buf, buf_len, "%s:%u",
inet_ntoa(nsvc->frgre.bts_addr.sin_addr), osmo_ntohs(nsvc->frgre.bts_addr.sin_port));
break;
default:
@@ -1543,11 +1541,17 @@ const char *gprs_ns_ll_str(const struct gprs_nsvc *nsvc)
break;
}
- buf[sizeof(buf) - 1] = '\0';
+ buf[buf_len - 1] = '\0';
return buf;
}
+const char *gprs_ns_ll_str(const struct gprs_nsvc *nsvc)
+{
+ static char buf[80];
+ return gprs_ns_ll_str_buf(buf, sizeof(buf), nsvc);
+}
+
void gprs_ns_ll_copy(struct gprs_nsvc *nsvc, struct gprs_nsvc *other)
{
nsvc->ll = other->ll;
diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map
index 2ad3ff71..21929da1 100644
--- a/src/gb/libosmogb.map
+++ b/src/gb/libosmogb.map
@@ -64,6 +64,7 @@ gprs_ns_tx_status;
gprs_ns_tx_unblock;
gprs_ns_vty_init;
gprs_ns_ll_str;
+gprs_ns_ll_str_buf;
gprs_ns_ll_copy;
gprs_ns_ll_clear;
gprs_ns_msgb_alloc;