<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/18168">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>New define is available since libosmocore 1.1.0, and we already require<br>1.2.0, so no need to update dependenices.<br>Let's change it to avoid people re-using old BSC_FD_* symbols when<br>copy-pasting somewhere else.<br><br>Change-Id: Iaebd049e383b02204a12f39cc6c932a53d25fd72<br>---<br>M src/gprs/sgsn_ares.c<br>M src/gtphub/gtphub.c<br>M src/sgsn/sgsn_libgtp.c<br>3 files changed, 13 insertions(+), 13 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/68/18168/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/sgsn_ares.c b/src/gprs/sgsn_ares.c</span><br><span>index ba168d6..38e31e1 100644</span><br><span>--- a/src/gprs/sgsn_ares.c</span><br><span>+++ b/src/gprs/sgsn_ares.c</span><br><span>@@ -51,8 +51,8 @@</span><br><span> LOGP(DGPRS, LOGL_DEBUG, "C-ares fd(%d) ready(%d)\n", fd->fd, what);</span><br><span> </span><br><span> ares_process_fd(sgsn->ares_channel,</span><br><span style="color: hsl(0, 100%, 40%);">- (what & BSC_FD_READ) ? fd->fd : ARES_SOCKET_BAD,</span><br><span style="color: hsl(0, 100%, 40%);">- (what & BSC_FD_WRITE) ? fd->fd : ARES_SOCKET_BAD);</span><br><span style="color: hsl(120, 100%, 40%);">+ (what & OSMO_FD_READ) ? fd->fd : ARES_SOCKET_BAD,</span><br><span style="color: hsl(120, 100%, 40%);">+ (what & OSMO_FD_WRITE) ? fd->fd : ARES_SOCKET_BAD);</span><br><span> osmo_ares_reschedule(sgsn);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -120,14 +120,14 @@</span><br><span> </span><br><span> update_fd:</span><br><span> if (read)</span><br><span style="color: hsl(0, 100%, 40%);">- ufd->fd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ufd->fd.when |= OSMO_FD_READ;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- ufd->fd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ufd->fd.when &= ~OSMO_FD_READ;</span><br><span> </span><br><span> if (write)</span><br><span style="color: hsl(0, 100%, 40%);">- ufd->fd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ufd->fd.when |= OSMO_FD_WRITE;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- ufd->fd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ufd->fd.when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> osmo_ares_reschedule(sgsn);</span><br><span> }</span><br><span>diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c</span><br><span>index ca5857b..7b355bf 100644</span><br><span>--- a/src/gtphub/gtphub.c</span><br><span>+++ b/src/gtphub/gtphub.c</span><br><span>@@ -853,7 +853,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when = OSMO_FD_READ;</span><br><span> ofd->cb = cb;</span><br><span> ofd->data = data;</span><br><span> ofd->priv_nr = ofd_id;</span><br><span>@@ -1948,7 +1948,7 @@</span><br><span> LOG(LOGL_DEBUG, "=== reading from SGSN (%s)\n",</span><br><span> gtphub_plane_idx_names[plane_idx]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!(what & BSC_FD_READ))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(what & OSMO_FD_READ))</span><br><span> return 0;</span><br><span> </span><br><span> struct gtphub *hub = from_sgsns_ofd->data;</span><br><span>@@ -1979,7 +1979,7 @@</span><br><span> OSMO_ASSERT(plane_idx < GTPH_PLANE_N);</span><br><span> LOG(LOGL_DEBUG, "=== reading from GGSN (%s)\n",</span><br><span> gtphub_plane_idx_names[plane_idx]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(what & BSC_FD_READ))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(what & OSMO_FD_READ))</span><br><span> return 0;</span><br><span> </span><br><span> struct gtphub *hub = from_ggsns_ofd->data;</span><br><span>diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c</span><br><span>index c20c8dc..7b46476 100644</span><br><span>--- a/src/sgsn/sgsn_libgtp.c</span><br><span>+++ b/src/sgsn/sgsn_libgtp.c</span><br><span>@@ -733,7 +733,7 @@</span><br><span> struct sgsn_instance *sgi = fd->data;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!(what & BSC_FD_READ))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(what & OSMO_FD_READ))</span><br><span> return 0;</span><br><span> </span><br><span> switch (fd->priv_nr) {</span><br><span>@@ -774,7 +774,7 @@</span><br><span> sgi->gtp_fd0.fd = gsn->fd0;</span><br><span> sgi->gtp_fd0.priv_nr = 0;</span><br><span> sgi->gtp_fd0.data = sgi;</span><br><span style="color: hsl(0, 100%, 40%);">- sgi->gtp_fd0.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ sgi->gtp_fd0.when = OSMO_FD_READ;</span><br><span> sgi->gtp_fd0.cb = sgsn_gtp_fd_cb;</span><br><span> rc = osmo_fd_register(&sgi->gtp_fd0);</span><br><span> if (rc < 0)</span><br><span>@@ -783,7 +783,7 @@</span><br><span> sgi->gtp_fd1c.fd = gsn->fd1c;</span><br><span> sgi->gtp_fd1c.priv_nr = 1;</span><br><span> sgi->gtp_fd1c.data = sgi;</span><br><span style="color: hsl(0, 100%, 40%);">- sgi->gtp_fd1c.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ sgi->gtp_fd1c.when = OSMO_FD_READ;</span><br><span> sgi->gtp_fd1c.cb = sgsn_gtp_fd_cb;</span><br><span> rc = osmo_fd_register(&sgi->gtp_fd1c);</span><br><span> if (rc < 0) {</span><br><span>@@ -794,7 +794,7 @@</span><br><span> sgi->gtp_fd1u.fd = gsn->fd1u;</span><br><span> sgi->gtp_fd1u.priv_nr = 2;</span><br><span> sgi->gtp_fd1u.data = sgi;</span><br><span style="color: hsl(0, 100%, 40%);">- sgi->gtp_fd1u.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ sgi->gtp_fd1u.when = OSMO_FD_READ;</span><br><span> sgi->gtp_fd1u.cb = sgsn_gtp_fd_cb;</span><br><span> rc = osmo_fd_register(&sgi->gtp_fd1u);</span><br><span> if (rc < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/18168">change 18168</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/+/18168"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaebd049e383b02204a12f39cc6c932a53d25fd72 </div>
<div style="display:none"> Gerrit-Change-Number: 18168 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>