Fix declaration of struct rtentry and SIOCADDRT/DELRT ioctls on certain FreeBSD versions

[dim]

Summary

This fixes the declaration of struct rtentry, and the SIOCADDRT/DELRT ioctls on certain FreeBSD versions.

[kutuzov.viktor.84]

Please upload this diff with full context as described at:

http://llvm.org/docs/Phabricator.html#id3

lib/sanitizer_common/sanitizer_platform_limits_posix.cc

661

Should we define these for Linux as well?

[kutuzov.viktor.84]

lib/sanitizer_common/sanitizer_platform_limits_posix.cc

36

It appears SANITIZER_FREEBSD_RTENTRY is not defined on MAC and Linux. I would expect it to expand to 0 on these platforms.

378

Looks like it should be:

#if SANITIZER_LINUX || SANITIZER_FREEBSD_RTENTRY

661

#if SANITIZER_LINUX || SANITIZER_FREEBSD_RTENTRY ?

[dim]

Solved in a different manner, in the mean time.

lib/sanitizer_common/sanitizer_platform_limits_posix.cc

 //
 // Sizes and layouts of platform-specific POSIX data structures.
 //===----------------------------------------------------------------------===//
 
 
 #include "sanitizer_platform.h"
 #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
 
+#if SANITIZER_FREEBSD
+# include <sys/param.h>
+# if __FreeBSD_version <= 1000707 || \
+    (__FreeBSD_version >= 1100000 && __FreeBSD_version <= 1100013)
+#  define SANITIZER_FREEBSD_RTENTRY 1
+# else
+#  define SANITIZER_FREEBSD_RTENTRY 0
+# endif
+#endif
+
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
 #include <limits.h>
 #include <net/if.h>
 #include <net/if_arp.h>
+#if SANITIZER_FREEBSD_RTENTRY
+#define _WANT_RTENTRY // to declare 'rtentry' structure
+#include <sys/socketvar.h>
+#endif
 #include <net/route.h>
+#if SANITIZER_FREEBSD_RTENTRY
+#undef _WANT_RTENTRY
+#endif
 #include <netdb.h>
 #include <poll.h>
 #include <pthread.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stddef.h>
 #include <sys/mman.h>
 #include <sys/resource.h>

 #else
   unsigned struct_copr_buffer_sz = sizeof(struct copr_buffer);
   unsigned struct_copr_debug_buf_sz = sizeof(struct copr_debug_buf);
   unsigned struct_copr_msg_sz = sizeof(struct copr_msg);
 #endif
   unsigned struct_midi_info_sz = sizeof(struct midi_info);
   unsigned struct_mtget_sz = sizeof(struct mtget);
   unsigned struct_mtop_sz = sizeof(struct mtop);
+#if SANITIZER_FREEBSD && SANITIZER_FREEBSD_RTENTRY
   unsigned struct_rtentry_sz = sizeof(struct rtentry);
+#endif
   unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument);
   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
   unsigned struct_synth_info_sz = sizeof(struct synth_info);
   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
 #endif  // SANITIZER_LINUX || SANITIZER_FREEBSD
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
#endif  // SOUND_VERSION
   unsigned IOCTL_VT_RESIZE = VT_RESIZE;
   unsigned IOCTL_VT_RESIZEX = VT_RESIZEX;
   unsigned IOCTL_VT_SENDSIG = VT_SENDSIG;
 #endif // SANITIZER_LINUX
 
 #if SANITIZER_LINUX || SANITIZER_FREEBSD
   unsigned IOCTL_MTIOCGET = MTIOCGET;
   unsigned IOCTL_MTIOCTOP = MTIOCTOP;
+#if SANITIZER_FREEBSD_RTENTRY
   unsigned IOCTL_SIOCADDRT = SIOCADDRT;
   unsigned IOCTL_SIOCDELRT = SIOCDELRT;
+#endif
   unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE = SNDCTL_DSP_GETBLKSIZE;
   unsigned IOCTL_SNDCTL_DSP_GETFMTS = SNDCTL_DSP_GETFMTS;
   unsigned IOCTL_SNDCTL_DSP_NONBLOCK = SNDCTL_DSP_NONBLOCK;
   unsigned IOCTL_SNDCTL_DSP_POST = SNDCTL_DSP_POST;
   unsigned IOCTL_SNDCTL_DSP_RESET = SNDCTL_DSP_RESET;
   unsigned IOCTL_SNDCTL_DSP_SETFMT = SNDCTL_DSP_SETFMT;
   unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT = SNDCTL_DSP_SETFRAGMENT;
   unsigned IOCTL_SNDCTL_DSP_SPEED = SNDCTL_DSP_SPEED;