proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 07:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

Browse Source 
* sockopt.c: (setsockopt_ipv4_ifindex) Improve error message.
	  When neither IP_PKTINFO nor IP_RECVIF is defined, make return value
	  deterministic (-1).
This commit is contained in:
ajs 2004-12-28 21:43:17 +00:00
parent af04bd7c10
commit 1d75c8c3b2
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* sockopt.c: (setsockopt_ipv4_ifindex) Improve error message.
When neither IP_PKTINFO nor IP_RECVIF is defined, make return value
deterministic (-1).
2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu> 2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* thread.c: (funcname_thread_add_timer_msec) Reduce overflow risk. * thread.c: (funcname_thread_add_timer_msec) Reduce overflow risk.

13
lib/sockopt.c
View File

@ -242,17 +242,20 @@ setsockopt_ipv4_ifindex (int sock, int val)
int ret; int ret;
#if defined (IP_PKTINFO) #if defined (IP_PKTINFO)
ret = setsockopt (sock, IPPROTO_IP, IP_PKTINFO, &val, sizeof (val)); if ((ret = setsockopt (sock, IPPROTO_IP, IP_PKTINFO, &val, sizeof (val))) < 0)
zlog_warn ("Can't set IP_PKTINFO option for fd %d to %d: %s",
sock,val,safe_strerror(errno));
#elif defined (IP_RECVIF) #elif defined (IP_RECVIF)
ret = setsockopt (sock, IPPROTO_IP, IP_RECVIF, &val, sizeof (val)); if ((ret = setsockopt (sock, IPPROTO_IP, IP_RECVIF, &val, sizeof (val))) < 0)
zlog_warn ("Can't set IP_RECVIF option for fd %d to %d: %s",
sock,val,safe_strerror(errno));
#else #else
#warning "Neither IP_PKTINFO nor IP_RECVIF is available." #warning "Neither IP_PKTINFO nor IP_RECVIF is available."
#warning "Will not be able to receive link info." #warning "Will not be able to receive link info."
#warning "Things might be seriously broken.." #warning "Things might be seriously broken.."
/* XXX Does this ever happen? Should there be a zlog_warn message here? */
ret = -1;
#endif #endif
if (ret < 0)
zlog_warn ("Can't set IP_PKTINFO option");
return ret; return ret;
} }