<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/20278">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drop duplicate ran_peer_find() vs ran_peer_find_by_addr()<br><br>This is the same function existing twice with different names. Keep only one.<br><br>Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf<br>---<br>M include/osmocom/msc/ran_peer.h<br>M src/libmsc/ran_peer.c<br>2 files changed, 3 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/20278/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h</span><br><span>index 06ab500..bdca317 100644</span><br><span>--- a/include/osmocom/msc/ran_peer.h</span><br><span>+++ b/include/osmocom/msc/ran_peer.h</span><br><span>@@ -91,7 +91,7 @@</span><br><span> };</span><br><span> </span><br><span> struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);</span><br><span style="color: hsl(0, 100%, 40%);">-struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr);</span><br><span> </span><br><span> void ran_peer_cells_seen_add(struct ran_peer *ran_peer, const struct gsm0808_cell_id *id);</span><br><span> </span><br><span>@@ -106,4 +106,3 @@</span><br><span> </span><br><span> struct ran_peer *ran_peer_find_by_cell_id(struct sccp_ran_inst *sri, const struct gsm0808_cell_id *cid,</span><br><span>                                     bool expecting_single_match);</span><br><span style="color: hsl(0, 100%, 40%);">-struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr);</span><br><span>diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c</span><br><span>index 001dfb1..fcb5f5a 100644</span><br><span>--- a/src/libmsc/ran_peer.c</span><br><span>+++ b/src/libmsc/ran_peer.c</span><br><span>@@ -80,13 +80,13 @@</span><br><span> </span><br><span> struct ran_peer *ran_peer_find_or_create(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct ran_peer *rp = ran_peer_find(sri, peer_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+  struct ran_peer *rp = ran_peer_find_by_addr(sri, peer_addr);</span><br><span>         if (rp)</span><br><span>              return rp;</span><br><span>   return ran_peer_alloc(sri, peer_addr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct ran_peer *ran_peer_find(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)</span><br><span style="color: hsl(120, 100%, 40%);">+struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *peer_addr)</span><br><span> {</span><br><span>     struct ran_peer *rp;</span><br><span>         llist_for_each_entry(rp, &sri->ran_peers, entry) {</span><br><span>@@ -624,17 +624,6 @@</span><br><span>     return found;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct ran_peer *ran_peer_find_by_addr(struct sccp_ran_inst *sri, const struct osmo_sccp_addr *addr)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-     struct ran_peer *rp;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    llist_for_each_entry(rp, &sri->ran_peers, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (!osmo_sccp_addr_ri_cmp(addr, &rp->peer_addr))</span><br><span style="color: hsl(0, 100%, 40%);">-                        return rp;</span><br><span style="color: hsl(0, 100%, 40%);">-      }</span><br><span style="color: hsl(0, 100%, 40%);">-       return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int ran_peers_down_paging(struct sccp_ran_inst *sri, enum CELL_IDENT page_where, struct vlr_subscr *vsub,</span><br><span>                     enum paging_cause cause)</span><br><span> {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/20278">change 20278</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-msc/+/20278"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If54b54fa61ece0f95564d403e1439fc5f5ededdf </div>
<div style="display:none"> Gerrit-Change-Number: 20278 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>