mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

In in_pcbconnect_setup() reduce code duplication and use ip_rtaddr()

Browse Source 
to find the outgoing interface for this connection.

Sponsored by:	TCP/IP Optimization Fundraise 2005
MFC after:	2 weeks
This commit is contained in:
Andre Oppermann 2006-02-16 15:45:28 +00:00
parent a4684d742d
commit cf744713e8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=155759
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/netinet/in_pcb.c
View File

@ -591,29 +591,23 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam,
&in_ifaddrhead)->ia_broadaddr)->sin_addr; &in_ifaddrhead)->ia_broadaddr)->sin_addr;
} }
if (laddr.s_addr == INADDR_ANY) { if (laddr.s_addr == INADDR_ANY) {
struct route sro;
bzero(&sro, sizeof(sro));
ia = (struct in_ifaddr *)0; ia = (struct in_ifaddr *)0;
/* /*
* If route is known our src addr is taken from the i/f, * If route is known our src addr is taken from the i/f,
* else punt. * else punt.
*
* Find out route to destination
*/ */
if ((inp->inp_socket->so_options & SO_DONTROUTE) == 0) { if ((inp->inp_socket->so_options & SO_DONTROUTE) == 0)
/* Find out route to destination */ ia = ip_rtaddr(faddr);
sro.ro_dst.sa_family = AF_INET;
sro.ro_dst.sa_len = sizeof(struct sockaddr_in);
((struct sockaddr_in *)&sro.ro_dst)->sin_addr = faddr;
rtalloc_ign(&sro, RTF_CLONING);
}
/* /*
* If we found a route, use the address * If we found a route, use the address corresponding to
* corresponding to the outgoing interface. * the outgoing interface.
*
* Otherwise assume faddr is reachable on a directly connected
* network and try to find a corresponding interface to take
* the source address from.
*/ */
if (sro.ro_rt) {
ia = ifatoia(sro.ro_rt->rt_ifa);
RTFREE(sro.ro_rt);
}
if (ia == 0) { if (ia == 0) {
bzero(&sa, sizeof(sa)); bzero(&sa, sizeof(sa));
sa.sin_addr = faddr; sa.sin_addr = faddr;