Add back Solaris support - initial commit

Builds on Solaris 11.4 with libyan (CESNET/libyang#2453):

  ./bootstrap.sh
  MAKE=gmake ./configure --disable-protobuf
  gmake
  gmake check

Author: psumbera

bfdd/bfdd.c

@@ -208,7 +208,7 @@ distributed_bfd_init(const char *arg)
 	union {
 		struct sockaddr_in sin;
 		struct sockaddr_in6 sin6;
-		struct sockaddr_un sun;
+		struct sockaddr_un un;
 	} sa;
 
 	/* Basic parsing: find ':' to figure out type part and address part. */
@@ -236,9 +236,9 @@ distributed_bfd_init(const char *arg)
 		if (strcmp(type, "unixc") == 0)
 			is_client = true;
 
-		salen = sizeof(sa.sun);
-		sa.sun.sun_family = AF_UNIX;
-		strlcpy(sa.sun.sun_path, addr, sizeof(sa.sun.sun_path));
+		salen = sizeof(sa.un);
+		sa.un.sun_family = AF_UNIX;
+		strlcpy(sa.un.sun_path, addr, sizeof(sa.un.sun_path));
 	} else if (strcmp(type, "ipv4") == 0 || strcmp(type, "ipv4c") == 0) {
 		if (strcmp(type, "ipv4c") == 0)
 			is_client = true;

bfdd/dplane.c

@@ -51,7 +51,7 @@ struct bfd_dplane_ctx {
 		struct sockaddr sa;
 		struct sockaddr_in sin;
 		struct sockaddr_in6 sin6;
-		struct sockaddr_un sun;
+		struct sockaddr_un un;
 	} addr;
 	/** Address length. */
 	socklen_t addrlen;

bgpd/bgp_route.c

@@ -14953,6 +14953,12 @@ static const char *table_stats_strs[][2] = {
 	[BGP_STATS_MAX] = {NULL, NULL}
 };
 
+/* Avoid: error: braced-group within expression allowed only inside a function */
+#ifdef __sun__
+#undef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
 struct bgp_table_stats {
 	struct bgp_table *table;
 	unsigned long long counts[BGP_STATS_MAX];

bgpd/bgp_routemap.c

@@ -2294,10 +2294,12 @@ route_set_l3vpn_nexthop_encapsulation(void *rule, const struct prefix *prefix,
 
 	path = object;
 
+#ifdef IPPROTO_GRE /* Solaris doesn't define IPPROTO_GRE */
 	if (rins->protocol != IPPROTO_GRE)
 		return RMAP_OKAY;
 
 	SET_FLAG(path->attr->rmap_change_flags, BATTR_RMAP_L3VPN_ACCEPT_GRE);
+#endif
 	return RMAP_OKAY;
 }
 
@@ -2310,7 +2312,9 @@ static void *route_set_l3vpn_nexthop_encapsulation_compile(const char *arg)
 		       sizeof(struct rmap_l3vpn_nexthop_encapsulation_set));
 
 	/* XXX ALL GRE modes are accepted for now: gre or ip6gre */
+#ifdef IPPROTO_GRE
 	rins->protocol = IPPROTO_GRE;
+#endif
 
 	return rins;
 }

configure.ac

@@ -1164,13 +1164,6 @@ fi
 dnl -------------------------
 dnl Check other header files.
 dnl -------------------------
-AC_CHECK_HEADERS([ \
-	asm/types.h sys/endian.h])
-
-AC_CHECK_HEADER([endian.h], [], [
-  AC_MSG_ERROR([missing endian.h])
-])
-
 AC_CHECK_LIB([atomic], [main], [LIBS="$LIBS -latomic"], [], [])
 
 AC_CHECK_HEADER([stdatomic.h],[
@@ -1334,7 +1327,10 @@ is_linux=false
 AC_MSG_CHECKING([which operating system interface to use])
 case "$host_os" in
   sunos* | solaris2*)
-    AC_MSG_FAILURE([Solaris support has been removed please see versions prior or equal to 7.5])
+    AC_MSG_RESULT([Solaris])
+
+    AC_DEFINE([SUNOS_5], [1], [Solaris])
+    AC_DEFINE([SOLARIS_IPV6], [1], Solaris IPv6)
     ;;
   linux*)
     AC_MSG_RESULT([Linux])

endian.h

@@ -0,0 +1,65 @@
+/* substitution of system endina.h for Solaris */
+
+#if !defined(__sun__)
+
+#ifdef HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+#include <endian.h>
+
+#else
+
+#ifndef _ENDIAN_H
+#define _ENDIAN_H
+
+#include <arpa/inet.h> 
+#include <sys/types.h>
+#include <sys/byteorder.h>
+
+// Numeric values commonly used for endian macros:
+#define LITTLE_ENDIAN 1234
+#define BIG_ENDIAN    4321
+#define PDP_ENDIAN    3412 // Rare, but occasionally referenced
+
+#if defined(__sparc) || defined(__sparcv9)
+#  define BYTE_ORDER    BIG_ENDIAN
+#  define __BYTE_ORDER  BIG_ENDIAN
+#elif defined(__i386) || defined(__amd64) || defined(__x86_64)
+#  define BYTE_ORDER    LITTLE_ENDIAN
+#  define __BYTE_ORDER  LITTLE_ENDIAN
+#else
+#  error "Unsupported architecture"
+#endif
+
+// Byte swap wrappers, mapping to Solaris equivalents if used by your codebase
+#ifndef bswap_32
+#  define bswap_32(x) BSWAP_32(x)
+#endif
+
+#ifndef bswap_16
+#  define bswap_16(x) BSWAP_16(x)
+#endif
+
+#ifndef htobe64
+static inline uint64_t htobe64(uint64_t x) {
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+    return (((uint64_t)htonl(x & 0xFFFFFFFFULL)) << 32) | htonl(x >> 32);
+#else
+    return x;
+#endif
+}
+#endif
+
+#ifndef be64toh
+static inline uint64_t be64toh(uint64_t x) {
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+    return (((uint64_t)ntohl(x & 0xFFFFFFFFULL)) << 32) | ntohl(x >> 32);
+#else
+    return x;
+#endif
+}
+#endif
+
+#endif /* _ENDIAN_H */
+
+#endif

isisd/isis_bpf.c

@@ -36,6 +36,12 @@
 
 #include "privs.h"
 
+#ifdef __sun__
+#include <sys/filio.h> /* for FIONREAD */
+#define ETHER_HDR_LEN 14
+#define ETHER_ADDR_LEN ETHERADDRL
+#endif
+
 struct bpf_insn llcfilter[] = {
 	BPF_STMT(BPF_LD + BPF_B + BPF_ABS,
 		 ETHER_HDR_LEN), /* check first byte */
@@ -270,10 +276,10 @@ int isis_send_pdu_bcast(struct isis_circuit *circuit, int level)
 	 */
 	eth = (struct ether_header *)sock_buff;
 	if (level == 1)
-		memcpy(eth->ether_dhost, ALL_L1_ISS, ETH_ALEN);
+		memcpy(eth->ether_dhost.ether_addr_octet, ALL_L1_ISS, ETH_ALEN);
 	else
-		memcpy(eth->ether_dhost, ALL_L2_ISS, ETH_ALEN);
-	memcpy(eth->ether_shost, circuit->u.bc.snpa, ETH_ALEN);
+		memcpy(eth->ether_dhost.ether_addr_octet, ALL_L2_ISS, ETH_ALEN);
+	memcpy(eth->ether_shost.ether_addr_octet, circuit->u.bc.snpa, ETH_ALEN);
 	size_t frame_size = stream_get_endp(circuit->snd_stream) + LLC_LEN;
 	eth->ether_type = htons(isis_ethertype(frame_size));
 

isisd/isis_flags.c

@@ -8,6 +8,8 @@
  *                           Institute of Communications Engineering
  */
 
+#include <strings.h>
+
 #include <zebra.h>
 #include "log.h"
 #include "linklist.h"

lib/event.c

@@ -10,6 +10,9 @@
 #include <signal.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
+#ifdef __sun__
+#include <sys/loadavg.h>
+#endif
 
 #include "frrevent.h"
 #include "memory.h"

lib/keychain_cli.c

@@ -173,7 +173,16 @@ static long __timezone_offset(void)
 
 	time(&now);
 	tm_now = localtime(&now);
+#if defined(__sun__)
+	struct tm gm_tm;
+	gmtime_r(&now, &gm_tm);
+	gm_tm.tm_isdst = tm_now->tm_isdst;
+	time_t local_time = mktime(tm_now);
+	time_t gm_time = mktime(&gm_tm);
+	return (long)difftime(local_time, gm_time);
+#else
 	return tm_now->tm_gmtoff;
+#endif
 }
 
 static int __lifetime_set(struct vty *vty, char timebuf[32],