Add user `frr` into group `frrvty`

[mirror_frr.git] / lib / sockunion.h

diff --git a/lib/sockunion.h b/lib/sockunion.h
index a33051ae57775a26f56f4379ce8a07ecd5f81d3c..3af3d78059095b0c37ecd5f12fc3b323339c6e5a 100644 (file)
--- a/lib/sockunion.h
+++ b/lib/sockunion.h
@@ -24,12 +24,19 @@
 #define _ZEBRA_SOCKUNION_H
 
 #include "privs.h"
+#include "if.h"
+#ifdef __OpenBSD__
+#include <netmpls/mpls.h>
+#endif
 
 union sockunion 
 {
   struct sockaddr sa;
   struct sockaddr_in sin;
   struct sockaddr_in6 sin6;
+#ifdef __OpenBSD__
+  struct sockaddr_mpls smpls;
+#endif
 };
 
 enum connect_result
@@ -95,24 +102,11 @@ extern int sockunion_socket (const union sockunion *su);
 extern const char *inet_sutop (const union sockunion *su, char *str);
 extern enum connect_result sockunion_connect (int fd, const union sockunion *su, 
                                               unsigned short port,
-                                              unsigned int);
+                                              ifindex_t);
 extern union sockunion *sockunion_getsockname (int);
 extern union sockunion *sockunion_getpeername (int);
 extern union sockunion *sockunion_dup (const union sockunion *);
 extern void sockunion_free (union sockunion *);
 extern void sockunion_init (union sockunion *);
 
-#ifndef HAVE_INET_NTOP
-extern const char * inet_ntop (int family, const void *addrptr, 
-                               char *strptr, size_t len);
-#endif /* HAVE_INET_NTOP */
-
-#ifndef HAVE_INET_PTON
-extern int inet_pton (int family, const char *strptr, void *addrptr);
-#endif /* HAVE_INET_PTON */
-
-#ifndef HAVE_INET_ATON
-extern int inet_aton (const char *cp, struct in_addr *inaddr);
-#endif
-
 #endif /* _ZEBRA_SOCKUNION_H */