<p>laforge would like lynxis lazus to <strong>review</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/19615">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr<br><br>The osmo_ prefix should be only used for official struct/apis of libosmocore.<br>This commit was done via `sed -i 's/osmo_sockaddr/sgsn_sockaddr/g'`.<br><br>In prepartion of introducing a different api of osmo_sockaddr to<br>libosmocore.<br><br>Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566<br>---<br>M include/osmocom/sgsn/gtphub.h<br>M src/gprs/gtphub.c<br>M src/gprs/gtphub_sock.c<br>M tests/gtphub/gtphub_test.c<br>4 files changed, 95 insertions(+), 95 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/15/19615/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gtphub.h b/include/osmocom/sgsn/gtphub.h</span><br><span>index 8fd9f38..6a439b5 100644</span><br><span>--- a/include/osmocom/sgsn/gtphub.h</span><br><span>+++ b/include/osmocom/sgsn/gtphub.h</span><br><span>@@ -35,14 +35,14 @@</span><br><span> </span><br><span> /* TODO move to osmocom/core/socket.c ? */</span><br><span> #include <netdb.h> /* for IPPROTO_* etc */</span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_sockaddr {</span><br><span style="color: hsl(120, 100%, 40%);">+struct sgsn_sockaddr {</span><br><span> struct sockaddr_storage a;</span><br><span> socklen_t l;</span><br><span> };</span><br><span> </span><br><span> /* TODO move to osmocom/core/socket.c ? */</span><br><span> /*! \brief Initialize a sockaddr</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] addr Valid osmo_sockaddr pointer to write result to</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] addr Valid sgsn_sockaddr pointer to write result to</span><br><span> * \param[in] family Address Family like AF_INET, AF_INET6, AF_UNSPEC</span><br><span> * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM</span><br><span> * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP</span><br><span>@@ -53,16 +53,16 @@</span><br><span> * Copy the first result from a getaddrinfo() call with the given parameters to</span><br><span> * *addr and *addr_len. On error, do not change *addr and return nonzero.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_init(struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_sockaddr_init(struct sgsn_sockaddr *addr,</span><br><span> uint16_t family, uint16_t type, uint8_t proto,</span><br><span> const char *host, uint16_t port);</span><br><span> </span><br><span> /* Conveniently pass AF_UNSPEC, SOCK_DGRAM and IPPROTO_UDP to</span><br><span style="color: hsl(0, 100%, 40%);">- * osmo_sockaddr_init(). */</span><br><span style="color: hsl(0, 100%, 40%);">-static inline int osmo_sockaddr_init_udp(struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ * sgsn_sockaddr_init(). */</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int sgsn_sockaddr_init_udp(struct sgsn_sockaddr *addr,</span><br><span> const char *host, uint16_t port)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_sockaddr_init(addr, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,</span><br><span style="color: hsl(120, 100%, 40%);">+ return sgsn_sockaddr_init(addr, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,</span><br><span> host, port);</span><br><span> }</span><br><span> </span><br><span>@@ -71,25 +71,25 @@</span><br><span> * \param[in] addr_str_len Size of buffer addr_str points at.</span><br><span> * \param[out] port_str Valid pointer to a buffer of length port_str_len.</span><br><span> * \param[in] port_str_len Size of buffer port_str points at.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] addr Binary representation as returned by osmo_sockaddr_init().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] addr Binary representation as returned by sgsn_sockaddr_init().</span><br><span> * \param[in] flags flags as passed to getnameinfo().</span><br><span> * \returns 0 on success, an error code on error.</span><br><span> *</span><br><span> * Return the IPv4 or IPv6 address string and the port (a.k.a. service) string</span><br><span style="color: hsl(0, 100%, 40%);">- * representations of the given struct osmo_sockaddr in two caller provided</span><br><span style="color: hsl(120, 100%, 40%);">+ * representations of the given struct sgsn_sockaddr in two caller provided</span><br><span> * char buffers. Flags of (NI_NUMERICHOST | NI_NUMERICSERV) return numeric</span><br><span> * address and port. Either one of addr_str or port_str may be NULL, in which</span><br><span> * case nothing is returned there.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * See also osmo_sockaddr_to_str() (less flexible, but much more convenient). */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_to_strs(char *addr_str, size_t addr_str_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ * See also sgsn_sockaddr_to_str() (less flexible, but much more convenient). */</span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_sockaddr_to_strs(char *addr_str, size_t addr_str_len,</span><br><span> char *port_str, size_t port_str_len,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *addr,</span><br><span> int flags);</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief concatenate the parts returned by osmo_sockaddr_to_strs().</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] addr Binary representation as returned by osmo_sockaddr_init().</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief concatenate the parts returned by sgsn_sockaddr_to_strs().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] addr Binary representation as returned by sgsn_sockaddr_init().</span><br><span> * \param[in] buf A buffer to use for string operations.</span><br><span> * \param[in] buf_len Length of the buffer.</span><br><span> * \returns Address string (in buffer).</span><br><span>@@ -98,33 +98,33 @@</span><br><span> * the form "<ip-addr> port <port>". The returned string is valid until the</span><br><span> * next invocation of this function.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-const char *osmo_sockaddr_to_strb(const struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+const char *sgsn_sockaddr_to_strb(const struct sgsn_sockaddr *addr,</span><br><span> char *buf, size_t buf_len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief conveniently return osmo_sockaddr_to_strb() in a static buffer.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] addr Binary representation as returned by osmo_sockaddr_init().</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief conveniently return sgsn_sockaddr_to_strb() in a static buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] addr Binary representation as returned by sgsn_sockaddr_init().</span><br><span> * \returns Address string in static buffer.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * See osmo_sockaddr_to_strb().</span><br><span style="color: hsl(120, 100%, 40%);">+ * See sgsn_sockaddr_to_strb().</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * Note: only one osmo_sockaddr_to_str() call will work per print/log</span><br><span style="color: hsl(0, 100%, 40%);">- * statement. For two or more, use osmo_sockaddr_to_strb() with a separate</span><br><span style="color: hsl(120, 100%, 40%);">+ * Note: only one sgsn_sockaddr_to_str() call will work per print/log</span><br><span style="color: hsl(120, 100%, 40%);">+ * statement. For two or more, use sgsn_sockaddr_to_strb() with a separate</span><br><span> * buffer each.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *addr);</span><br><span style="color: hsl(120, 100%, 40%);">+const char *sgsn_sockaddr_to_str(const struct sgsn_sockaddr *addr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief compare two osmo_sockaddr.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief compare two sgsn_sockaddr.</span><br><span> * \param[in] a The first address to compare.</span><br><span> * \param[in] b The other address to compare.</span><br><span> * \returns 0 if equal, otherwise -1 or 1.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_cmp(const struct osmo_sockaddr *a,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *b);</span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_sockaddr_cmp(const struct sgsn_sockaddr *a,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *b);</span><br><span> </span><br><span> /*! \brief Overwrite *dst with *src.</span><br><span> * Like memcpy(), but copy only the valid bytes. */</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_sockaddr_copy(struct osmo_sockaddr *dst,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *src);</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_sockaddr_copy(struct sgsn_sockaddr *dst,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *src);</span><br><span> </span><br><span> </span><br><span> /* general */</span><br><span>@@ -179,7 +179,7 @@</span><br><span> /* Decode sa to gsna. Return 0 on success. If port is non-NULL, the port number</span><br><span> * from sa is also returned. */</span><br><span> int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *sa);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *sa);</span><br><span> </span><br><span> /* expiry */</span><br><span> </span><br><span>@@ -389,7 +389,7 @@</span><br><span> struct gtphub_peer_addr *peer_addr;</span><br><span> uint16_t port;</span><br><span> unsigned int ref_count; /* references from other peers' seq_maps */</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr sa; /* a "cache" for (peer_addr->addr, port) */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr sa; /* a "cache" for (peer_addr->addr, port) */</span><br><span> int last_restart_count; /* 0..255 = valid, all else means unknown */</span><br><span> </span><br><span> struct rate_ctr_group *counters_io;</span><br><span>@@ -496,13 +496,13 @@</span><br><span> int gtphub_handle_buf(struct gtphub *hub,</span><br><span> unsigned int side_idx,</span><br><span> unsigned int port_idx,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *from_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *from_addr,</span><br><span> uint8_t *buf,</span><br><span> size_t received,</span><br><span> time_t now,</span><br><span> uint8_t **reply_buf,</span><br><span> struct osmo_fd **to_ofd,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *to_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *to_addr);</span><br><span> </span><br><span> struct gtphub_peer_port *gtphub_port_have(struct gtphub *hub,</span><br><span> struct gtphub_bind *bind,</span><br><span>@@ -510,7 +510,7 @@</span><br><span> uint16_t port);</span><br><span> </span><br><span> struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *addr);</span><br><span> </span><br><span> void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str,</span><br><span> struct gsn_addr *resolved_addr,</span><br><span>@@ -519,5 +519,5 @@</span><br><span> const char *gtphub_port_str(struct gtphub_peer_port *port);</span><br><span> </span><br><span> int gtphub_write(const struct osmo_fd *to,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *to_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *to_addr,</span><br><span> const uint8_t *buf, size_t buf_len);</span><br><span>diff --git a/src/gprs/gtphub.c b/src/gprs/gtphub.c</span><br><span>index ca5857b..3e5c6f0 100644</span><br><span>--- a/src/gprs/gtphub.c</span><br><span>+++ b/src/gprs/gtphub.c</span><br><span>@@ -167,12 +167,12 @@</span><br><span> }</span><br><span> </span><br><span> int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *sa)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *sa)</span><br><span> {</span><br><span> char addr_str[256];</span><br><span> char port_str[6];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_to_strs(addr_str, sizeof(addr_str),</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sgsn_sockaddr_to_strs(addr_str, sizeof(addr_str),</span><br><span> port_str, sizeof(port_str),</span><br><span> sa, (NI_NUMERICHOST | NI_NUMERICSERV))</span><br><span> != 0) {</span><br><span>@@ -925,7 +925,7 @@</span><br><span> /* Recv datagram from from->fd, write sender's address to *from_addr.</span><br><span> * Return the number of bytes read, zero on error. */</span><br><span> static int gtphub_read(const struct osmo_fd *from,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *from_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *from_addr,</span><br><span> uint8_t *buf, size_t buf_len)</span><br><span> {</span><br><span> OSMO_ASSERT(from_addr);</span><br><span>@@ -946,7 +946,7 @@</span><br><span> }</span><br><span> </span><br><span> LOG(LOGL_DEBUG, "Received %d bytes from %s: %s%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (int)received, osmo_sockaddr_to_str(from_addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ (int)received, sgsn_sockaddr_to_str(from_addr),</span><br><span> osmo_hexdump(buf, received > 1000? 1000 : received),</span><br><span> received > 1000 ? "..." : "");</span><br><span> </span><br><span>@@ -1954,8 +1954,8 @@</span><br><span> struct gtphub *hub = from_sgsns_ofd->data;</span><br><span> </span><br><span> static uint8_t buf[4096];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr from_addr;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr to_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr from_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr to_addr;</span><br><span> struct osmo_fd *to_ofd;</span><br><span> int len;</span><br><span> uint8_t *reply_buf;</span><br><span>@@ -1985,8 +1985,8 @@</span><br><span> struct gtphub *hub = from_ggsns_ofd->data;</span><br><span> </span><br><span> static uint8_t buf[4096];</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr from_addr;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr to_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr from_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr to_addr;</span><br><span> struct osmo_fd *to_ofd;</span><br><span> int len;</span><br><span> uint8_t *reply_buf;</span><br><span>@@ -2071,9 +2071,9 @@</span><br><span> </span><br><span> static int gsn_addr_to_sockaddr(struct gsn_addr *src,</span><br><span> uint16_t port,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *dst)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *dst)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_sockaddr_init_udp(dst, gsn_addr_to_str(src), port);</span><br><span style="color: hsl(120, 100%, 40%);">+ return sgsn_sockaddr_init_udp(dst, gsn_addr_to_str(src), port);</span><br><span> }</span><br><span> </span><br><span> /* If p is an Echo request, replace p's data with the matching response and</span><br><span>@@ -2107,7 +2107,7 @@</span><br><span> }</span><br><span> </span><br><span> struct gtphub_peer_port *gtphub_known_addr_have_port(const struct gtphub_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *addr);</span><br><span> </span><br><span> /* Parse buffer as GTP packet, replace elements in-place and return the ofd and</span><br><span> * address to forward to. Return a pointer to the osmo_fd, but copy the</span><br><span>@@ -2117,13 +2117,13 @@</span><br><span> int gtphub_handle_buf(struct gtphub *hub,</span><br><span> unsigned int side_idx,</span><br><span> unsigned int plane_idx,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *from_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *from_addr,</span><br><span> uint8_t *buf,</span><br><span> size_t received,</span><br><span> time_t now,</span><br><span> uint8_t **reply_buf,</span><br><span> struct osmo_fd **to_ofd,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *to_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *to_addr)</span><br><span> {</span><br><span> struct gtphub_bind *from_bind = &hub->to_gsns[side_idx][plane_idx];</span><br><span> struct gtphub_bind *to_bind = &hub->to_gsns[other_side_idx(side_idx)][plane_idx];</span><br><span>@@ -2138,7 +2138,7 @@</span><br><span> (side_idx == GTPH_SIDE_GGSN)? "<-" : "->",</span><br><span> gtphub_plane_idx_names[plane_idx],</span><br><span> gtphub_side_idx_names[side_idx],</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(from_addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(from_addr),</span><br><span> gtp_type_str(p.type));</span><br><span> </span><br><span> if (p.rc <= 0) {</span><br><span>@@ -2146,7 +2146,7 @@</span><br><span> gtp_type_str(p.type),</span><br><span> gtphub_side_idx_names[side_idx],</span><br><span> gtphub_plane_idx_names[plane_idx],</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(from_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(from_addr));</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -2156,7 +2156,7 @@</span><br><span> reply_len = gtphub_handle_echo_req(hub, &p, reply_buf);</span><br><span> if (reply_len > 0) {</span><br><span> /* It was an echo. Nothing left to do. */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_copy(to_addr, from_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_copy(to_addr, from_addr);</span><br><span> *to_ofd = &from_bind->ofd;</span><br><span> </span><br><span> rate_ctr_inc(&from_bind->counters_io->ctr[GTPH_CTR_PKTS_OUT]);</span><br><span>@@ -2165,7 +2165,7 @@</span><br><span> LOG(LOGL_DEBUG, "%s Echo response to %s: %d bytes to %s\n",</span><br><span> (side_idx == GTPH_SIDE_GGSN)? "-->" : "<--",</span><br><span> gtphub_side_idx_names[side_idx],</span><br><span style="color: hsl(0, 100%, 40%);">- (int)reply_len, osmo_sockaddr_to_str(to_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ (int)reply_len, sgsn_sockaddr_to_str(to_addr));</span><br><span> return reply_len;</span><br><span> }</span><br><span> if (reply_len < 0)</span><br><span>@@ -2178,7 +2178,7 @@</span><br><span> * so no-one else is allowed to talk to us from that side. */</span><br><span> struct gtphub_peer_port *from_peer = hub->proxy[side_idx][plane_idx];</span><br><span> if (from_peer) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_cmp(&from_peer->sa, from_addr) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sgsn_sockaddr_cmp(&from_peer->sa, from_addr) != 0) {</span><br><span> LOG(LOGL_ERROR,</span><br><span> "Rejecting: %s proxy configured, but GTP packet"</span><br><span> " received on %s bind is from another sender:"</span><br><span>@@ -2186,7 +2186,7 @@</span><br><span> gtphub_side_idx_names[side_idx],</span><br><span> gtphub_side_idx_names[side_idx],</span><br><span> gtphub_port_str(from_peer),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(from_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(from_addr));</span><br><span> return -1;</span><br><span> }</span><br><span> }</span><br><span>@@ -2204,7 +2204,7 @@</span><br><span> if (side_idx == GTPH_SIDE_GGSN) {</span><br><span> LOG(LOGL_ERROR, "Dropping packet%s: unknown GGSN peer: %s\n",</span><br><span> gtp_type_str(p.type),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(from_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(from_addr));</span><br><span> return -1;</span><br><span> } else {</span><br><span> /* SGSN */</span><br><span>@@ -2216,7 +2216,7 @@</span><br><span> "Dropping packet%s: User plane peer was not"</span><br><span> "announced by PDP Context: %s\n",</span><br><span> gtp_type_str(p.type),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(from_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(from_addr));</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -2235,7 +2235,7 @@</span><br><span> LOG(LOGL_ERROR, "Dropping packet%s: invalid %s peer: %s\n",</span><br><span> gtp_type_str(p.type),</span><br><span> gtphub_side_idx_names[side_idx],</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(from_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(from_addr));</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -2309,7 +2309,7 @@</span><br><span> if (!to_peer_from_seq)</span><br><span> gtphub_map_seq(&p, from_peer, to_peer);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_copy(to_addr, &to_peer->sa);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_copy(to_addr, &to_peer->sa);</span><br><span> </span><br><span> *reply_buf = (uint8_t*)p.data;</span><br><span> </span><br><span>@@ -2335,7 +2335,7 @@</span><br><span> (side_idx == GTPH_SIDE_SGSN)? "-->" : "<--",</span><br><span> gtphub_side_idx_names[other_side_idx(side_idx)],</span><br><span> p.header_tei, p.seq,</span><br><span style="color: hsl(0, 100%, 40%);">- (int)received, osmo_sockaddr_to_str(to_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ (int)received, sgsn_sockaddr_to_str(to_addr));</span><br><span> return received;</span><br><span> }</span><br><span> </span><br><span>@@ -2645,7 +2645,7 @@</span><br><span> }</span><br><span> </span><br><span> struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *addr)</span><br><span> {</span><br><span> struct gsn_addr gsna;</span><br><span> uint16_t port;</span><br><span>@@ -2762,7 +2762,7 @@</span><br><span> /* Find a GGSN peer with a matching address. If the address is known but the</span><br><span> * port not, create a new port for that peer address. */</span><br><span> struct gtphub_peer_port *gtphub_known_addr_have_port(const struct gtphub_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *addr)</span><br><span> {</span><br><span> struct gtphub_peer_addr *pa;</span><br><span> struct gtphub_peer_port *pp;</span><br><span>@@ -2817,7 +2817,7 @@</span><br><span> </span><br><span> /* TODO move to osmocom/core/socket.c ? */</span><br><span> /* use this in osmo_sock_init() to remove dup. */</span><br><span style="color: hsl(0, 100%, 40%);">-/* Internal: call getaddrinfo for osmo_sockaddr_init(). The caller is required</span><br><span style="color: hsl(120, 100%, 40%);">+/* Internal: call getaddrinfo for sgsn_sockaddr_init(). The caller is required</span><br><span> to call freeaddrinfo(*result), iff zero is returned. */</span><br><span> static int _osmo_getaddrinfo(struct addrinfo **result,</span><br><span> uint16_t family, uint16_t type, uint8_t proto,</span><br><span>@@ -2844,7 +2844,7 @@</span><br><span> }</span><br><span> </span><br><span> /* TODO move to osmocom/core/socket.c ? */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_init(struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_sockaddr_init(struct sgsn_sockaddr *addr,</span><br><span> uint16_t family, uint16_t type, uint8_t proto,</span><br><span> const char *host, uint16_t port)</span><br><span> {</span><br><span>@@ -2865,9 +2865,9 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_to_strs(char *addr_str, size_t addr_str_len,</span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_sockaddr_to_strs(char *addr_str, size_t addr_str_len,</span><br><span> char *port_str, size_t port_str_len,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *addr,</span><br><span> int flags)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -2896,14 +2896,14 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const char *osmo_sockaddr_to_strb(const struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+const char *sgsn_sockaddr_to_strb(const struct sgsn_sockaddr *addr,</span><br><span> char *buf, size_t buf_len)</span><br><span> {</span><br><span> const int portbuf_len = 6;</span><br><span> OSMO_ASSERT(buf_len > portbuf_len);</span><br><span> char *portbuf = buf + buf_len - portbuf_len;</span><br><span> buf_len -= portbuf_len;</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_sockaddr_to_strs(buf, buf_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sgsn_sockaddr_to_strs(buf, buf_len,</span><br><span> portbuf, portbuf_len,</span><br><span> addr,</span><br><span> NI_NUMERICHOST | NI_NUMERICSERV))</span><br><span>@@ -2918,17 +2918,17 @@</span><br><span> return buf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *addr)</span><br><span style="color: hsl(120, 100%, 40%);">+const char *sgsn_sockaddr_to_str(const struct sgsn_sockaddr *addr)</span><br><span> {</span><br><span> static char buf[256];</span><br><span style="color: hsl(0, 100%, 40%);">- const char *result = osmo_sockaddr_to_strb(addr, buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *result = sgsn_sockaddr_to_strb(addr, buf, sizeof(buf));</span><br><span> if (! result)</span><br><span> return "(invalid)";</span><br><span> return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_sockaddr_cmp(const struct osmo_sockaddr *a,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *b)</span><br><span style="color: hsl(120, 100%, 40%);">+int sgsn_sockaddr_cmp(const struct sgsn_sockaddr *a,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *b)</span><br><span> {</span><br><span> if (a == b)</span><br><span> return 0;</span><br><span>@@ -2938,7 +2938,7 @@</span><br><span> return 1;</span><br><span> if (a->l != b->l) {</span><br><span> /* Lengths are not the same, but determine the order. Will</span><br><span style="color: hsl(0, 100%, 40%);">- * anyone ever sort a list by osmo_sockaddr though...? */</span><br><span style="color: hsl(120, 100%, 40%);">+ * anyone ever sort a list by sgsn_sockaddr though...? */</span><br><span> int cmp = memcmp(&a->a, &b->a, (a->l < b->l)? a->l : b->l);</span><br><span> if (cmp == 0) {</span><br><span> if (a->l < b->l)</span><br><span>@@ -2951,8 +2951,8 @@</span><br><span> return memcmp(&a->a, &b->a, a->l);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_sockaddr_copy(struct osmo_sockaddr *dst,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *src)</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_sockaddr_copy(struct sgsn_sockaddr *dst,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *src)</span><br><span> {</span><br><span> OSMO_ASSERT(src->l <= sizeof(dst->a));</span><br><span> memcpy(&dst->a, &src->a, src->l);</span><br><span>diff --git a/src/gprs/gtphub_sock.c b/src/gprs/gtphub_sock.c</span><br><span>index 1acd5a6..1837533 100644</span><br><span>--- a/src/gprs/gtphub_sock.c</span><br><span>+++ b/src/gprs/gtphub_sock.c</span><br><span>@@ -33,13 +33,13 @@</span><br><span> LOGP(DGTPHUB, level, fmt, ##args)</span><br><span> </span><br><span> int gtphub_write(const struct osmo_fd *to,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *to_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *to_addr,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span> {</span><br><span> errno = 0;</span><br><span> ssize_t sent = sendto(to->fd, buf, buf_len, 0,</span><br><span> (struct sockaddr*)&to_addr->a, to_addr->l);</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(LOGL_DEBUG, "to %s\n", osmo_sockaddr_to_str(to_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG(LOGL_DEBUG, "to %s\n", sgsn_sockaddr_to_str(to_addr));</span><br><span> </span><br><span> if (sent == -1) {</span><br><span> LOG(LOGL_ERROR, "error: %s\n", strerror(errno));</span><br><span>diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c</span><br><span>index 2e48bb1..9a8ec6b 100644</span><br><span>--- a/tests/gtphub/gtphub_test.c</span><br><span>+++ b/tests/gtphub/gtphub_test.c</span><br><span>@@ -378,37 +378,37 @@</span><br><span> char resolve_ggsn_got_imsi[GSM23003_IMSI_MAX_DIGITS+1];</span><br><span> char resolve_ggsn_got_ni[GSM_APN_LENGTH];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_sockaddr resolved_ggsn_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+struct sgsn_sockaddr resolved_ggsn_addr;</span><br><span> static int resolve_to_ggsn(const char *addr, uint16_t port)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LVL2_ASSERT(osmo_sockaddr_init_udp(&resolved_ggsn_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ LVL2_ASSERT(sgsn_sockaddr_init_udp(&resolved_ggsn_addr,</span><br><span> addr, port)</span><br><span> == 0);</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_sockaddr resolved_sgsn_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+struct sgsn_sockaddr resolved_sgsn_addr;</span><br><span> static int resolve_to_sgsn(const char *addr, uint16_t port)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LVL2_ASSERT(osmo_sockaddr_init_udp(&resolved_sgsn_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ LVL2_ASSERT(sgsn_sockaddr_init_udp(&resolved_sgsn_addr,</span><br><span> addr, port)</span><br><span> == 0);</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_sockaddr sgsn_sender;</span><br><span style="color: hsl(120, 100%, 40%);">+struct sgsn_sockaddr sgsn_sender;</span><br><span> static int send_from_sgsn(const char *addr, uint16_t port)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LVL2_ASSERT(osmo_sockaddr_init_udp(&sgsn_sender,</span><br><span style="color: hsl(120, 100%, 40%);">+ LVL2_ASSERT(sgsn_sockaddr_init_udp(&sgsn_sender,</span><br><span> addr, port)</span><br><span> == 0);</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct osmo_sockaddr ggsn_sender;</span><br><span style="color: hsl(120, 100%, 40%);">+struct sgsn_sockaddr ggsn_sender;</span><br><span> static int send_from_ggsn(const char *addr, uint16_t port)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LVL2_ASSERT(osmo_sockaddr_init_udp(&ggsn_sender,</span><br><span style="color: hsl(120, 100%, 40%);">+ LVL2_ASSERT(sgsn_sockaddr_init_udp(&ggsn_sender,</span><br><span> addr, port)</span><br><span> == 0);</span><br><span> return 1;</span><br><span>@@ -491,18 +491,18 @@</span><br><span> </span><br><span> /* override, requires '-Wl,--wrap=gtphub_write' */</span><br><span> int __real_gtphub_write(const struct osmo_fd *to,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *to_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *to_addr,</span><br><span> const uint8_t *buf, size_t buf_len);</span><br><span> </span><br><span> int __wrap_gtphub_write(const struct osmo_fd *to,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *to_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *to_addr,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span> {</span><br><span> printf("Out-of-band gtphub_write(%d):\n"</span><br><span> "to %s\n"</span><br><span> "%s\n",</span><br><span> (int)buf_len,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(to_addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(to_addr),</span><br><span> osmo_hexdump(buf, buf_len));</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -553,11 +553,11 @@</span><br><span> }</span><br><span> </span><br><span> #define same_addr(GOT, EXPECTED) _same_addr((GOT),(EXPECTED), __FILE__, __LINE__)</span><br><span style="color: hsl(0, 100%, 40%);">-static int _same_addr(const struct osmo_sockaddr *got,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_sockaddr *expected,</span><br><span style="color: hsl(120, 100%, 40%);">+static int _same_addr(const struct sgsn_sockaddr *got,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sgsn_sockaddr *expected,</span><br><span> const char *file, int line)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int cmp = osmo_sockaddr_cmp(got, expected);</span><br><span style="color: hsl(120, 100%, 40%);">+ int cmp = sgsn_sockaddr_cmp(got, expected);</span><br><span> if (!cmp)</span><br><span> return 1;</span><br><span> char buf[256];</span><br><span>@@ -565,8 +565,8 @@</span><br><span> " expecting: '%s'\n"</span><br><span> " got: '%s'\n\n",</span><br><span> file, line,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_str(expected),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_sockaddr_to_strb(got, buf, sizeof(buf)));</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_str(expected),</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_sockaddr_to_strb(got, buf, sizeof(buf)));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -668,7 +668,7 @@</span><br><span> now = 123;</span><br><span> </span><br><span> struct osmo_fd *to_ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr to_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr to_addr;</span><br><span> struct gtphub_peer_port *pp;</span><br><span> int send;</span><br><span> </span><br><span>@@ -855,13 +855,13 @@</span><br><span> #define msg_from_sgsn_c(A,B,C,D) msg_from_sgsn(GTPH_PLANE_CTRL, A,B,C,D)</span><br><span> #define msg_from_sgsn_u(A,B,C,D) msg_from_sgsn(GTPH_PLANE_USER, A,B,C,D)</span><br><span> static int msg_from_sgsn(int plane_idx,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *_sgsn_sender,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *ggsn_receiver,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *_sgsn_sender,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *ggsn_receiver,</span><br><span> const char *hex_from_sgsn,</span><br><span> const char *hex_to_ggsn)</span><br><span> {</span><br><span> struct osmo_fd *ggsn_ofd = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr ggsn_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr ggsn_addr;</span><br><span> int send;</span><br><span> send = gtphub_handle_buf(hub, GTPH_SIDE_SGSN, plane_idx, _sgsn_sender,</span><br><span> buf, msg(hex_from_sgsn), now,</span><br><span>@@ -875,13 +875,13 @@</span><br><span> #define msg_from_ggsn_c(A,B,C,D) msg_from_ggsn(GTPH_PLANE_CTRL, A,B,C,D)</span><br><span> #define msg_from_ggsn_u(A,B,C,D) msg_from_ggsn(GTPH_PLANE_USER, A,B,C,D)</span><br><span> static int msg_from_ggsn(int plane_idx,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *ggsn_sender,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *sgsn_receiver,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *ggsn_sender,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr *sgsn_receiver,</span><br><span> const char *msg_from_ggsn,</span><br><span> const char *msg_to_sgsn)</span><br><span> {</span><br><span> struct osmo_fd *sgsn_ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr sgsn_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_sockaddr sgsn_addr;</span><br><span> int send;</span><br><span> send = gtphub_handle_buf(hub, GTPH_SIDE_GGSN, plane_idx, ggsn_sender,</span><br><span> buf, msg(msg_from_ggsn), now,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/19615">change 19615</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-sgsn/+/19615"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: rel-1.5.1 </div>
<div style="display:none"> Gerrit-Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 </div>
<div style="display:none"> Gerrit-Change-Number: 19615 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>