diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index 50acf99..43a3d77 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -210,8 +210,8 @@
  *  \return pointer to buf on success; NULL on error */
 char *gprs_ns2_ll_str_buf(char *buf, size_t buf_len, struct gprs_ns2_vc *nsvc)
 {
-	struct osmo_sockaddr *local;
-	struct osmo_sockaddr *remote;
+	const struct osmo_sockaddr *local;
+	const struct osmo_sockaddr *remote;
 	struct osmo_sockaddr_str local_str;
 	struct osmo_sockaddr_str remote_str;
 
@@ -847,7 +847,7 @@
 						  const struct osmo_sockaddr *sockaddr)
 {
 	struct gprs_ns2_vc *nsvc;
-	struct osmo_sockaddr *remote;
+	const struct osmo_sockaddr *remote;
 
 	OSMO_ASSERT(nse);
 	OSMO_ASSERT(sockaddr);
diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c
index fabc134..2756226 100644
--- a/src/gb/gprs_ns2_sns.c
+++ b/src/gb/gprs_ns2_sns.c
@@ -473,7 +473,7 @@
 	struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);
 	struct gprs_ns2_vc *nsvc;
 	struct osmo_sockaddr sa = {};
-	struct osmo_sockaddr *remote;
+	const struct osmo_sockaddr *remote;
 	uint8_t new_signal;
 	uint8_t new_data;
 
@@ -533,7 +533,7 @@
 	struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;
 	struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);
 	struct gprs_ns2_vc *nsvc, *tmp;
-	struct osmo_sockaddr *remote;
+	const struct osmo_sockaddr *remote;
 	struct osmo_sockaddr sa = {};
 
 	if (ip4) {
@@ -1239,7 +1239,9 @@
 	struct gprs_ns_ie_ip6_elem *ip6_elems;
 	struct gprs_ns2_vc_bind *bind;
 	struct gprs_ns2_inst *nsi = nse->nsi;
-	struct osmo_sockaddr *sa, local;
+	const struct osmo_sockaddr *sa;
+	struct osmo_sockaddr local;
+
 	gss->ip = remote->u.sa.sa_family == AF_INET ? IPv4 : IPv6;
 
 	gss->initial = *remote;
diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c
index 7ead71a..9aca80b 100644
--- a/src/gb/gprs_ns2_udp.c
+++ b/src/gb/gprs_ns2_udp.c
@@ -274,7 +274,7 @@
 						      const struct osmo_sockaddr *sockaddr)
 {
 	struct gprs_ns2_vc_bind *bind;
-	struct osmo_sockaddr *local;
+	const struct osmo_sockaddr *local;
 
 	OSMO_ASSERT(nsi);
 	OSMO_ASSERT(sockaddr);
@@ -396,7 +396,7 @@
 /*! Return the socket address of the remote peer of a NS-VC.
  *  \param[in] nsvc NS-VC whose remote peer we want to know
  *  \return address of the remote peer; NULL in case of error */
-struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc)
+const struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc)
 {
 	struct priv_vc *priv;
 
@@ -410,7 +410,7 @@
 /*! Return the locally bound socket address of the bind.
  *  \param[in] bind The bind whose local address we want to know
  *  \return address of the local bind */
-struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind)
+const struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind)
 {
 	struct priv_bind *priv;
 
diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c
index 55e87ae..92c0095 100644
--- a/src/gb/gprs_ns2_vty.c
+++ b/src/gb/gprs_ns2_vty.c
@@ -247,7 +247,7 @@
 {
 	struct osmo_sockaddr_str remote;
 	struct osmo_sockaddr_str local;
-	struct osmo_sockaddr *sockaddr;
+	const struct osmo_sockaddr *sockaddr;
 
 	switch (nsvc->ll) {
 	case GPRS_NS_LL_UDP: {