net,sip: remove net_dst_is_source_addr()

include/re_net.h

@@ -41,7 +41,6 @@ struct sa;
 /* Net generic */
 int  net_hostaddr(int af, struct sa *ip);
 int  net_dst_source_addr_get(const struct sa *dst, struct sa *ip);
-int  net_dst_is_source_addr(const struct sa *dst, const struct sa *ip);
 int  net_default_source_addr_get(int af, struct sa *ip);
 int  net_default_gateway_get(int af, struct sa *gw);
 

src/net/net.c

@@ -99,22 +99,6 @@ int net_dst_source_addr_get(const struct sa *dst, struct sa *ip)
 }
 
 
-int net_dst_is_source_addr(const struct sa *dst, const struct sa *ip)
-{
-	struct sa src;
-	int err;
-
-	err = net_dst_source_addr_get(dst, &src);
-	if (err)
-		return err;
-
-	if (!sa_cmp(ip, &src, SA_ADDR))
-		return ECONNREFUSED;
-
-	return 0;
-}
-
-
 /**
  * Get the default source IP address
  *

src/sip/transp.c

@@ -156,24 +156,28 @@ static const struct sip_transport *transp_find(struct sip *sip,
 	for (le = sip->transpl.head; le; le = le->next) {
 
 		const struct sip_transport *transp = le->data;
-		const struct sa *src = &transp->laddr;
+		const struct sa *laddr = &transp->laddr;
+		struct sa src;
 
 		if (transp->tp != tp)
 			continue;
 
-		if (af != AF_UNSPEC && sa_af(src) != af)
+		if (af != AF_UNSPEC && sa_af(laddr) != af)
 			continue;
 
 		if (!sa_isset(dst, SA_ADDR))
 			return transp;
 
-		if (sa_is_linklocal(src) != sa_is_linklocal(dst))
+		if (sa_is_linklocal(laddr) != sa_is_linklocal(dst))
 			continue;
 
 		sa_cpy(&dsttmp, dst);
-		sa_set_scopeid(&dsttmp, sa_scopeid(src));
+		sa_set_scopeid(&dsttmp, sa_scopeid(laddr));
 
-		if (net_dst_is_source_addr(&dsttmp, src))
+		if (net_dst_source_addr_get(&dsttmp, &src))
+			continue;
+
+		if (!sa_cmp(&src, laddr, SA_ADDR))
 			continue;
 
 		return transp;