SunOS: fix compilation issues.

Linux: add Docker build scripts for CentOS6.

docker_build/centos6/Dockerfile

@@ -0,0 +1,14 @@
+FROM centos:6
+RUN echo "UPDATE" && yum -y update
+RUN echo "DEVTOOLS" && yum -y groupinstall "Development Tools"
+RUN echo "EXTRAS" && yum -y install \
+      git \
+      libpcap-devel \
+      libvirt-devel \
+      libnfnetlink-devel \
+      libxml2-devel \
+      rpm-build \
+      dbus-devel
+RUN mkdir /packages && chown 777 /packages
+COPY build_hsflowd /root/build_hsflowd
+ENTRYPOINT ["/root/build_hsflowd"]

docker_build/centos6/build_hsflowd

@@ -0,0 +1,12 @@
+#!/bin/bash
+echo "build_hsflowd on platform:  $1"
+
+git clone https://github.com/sflow/host-sflow \
+&& cd host-sflow \
+&& make rpm FEATURES="ULOG NFLOG PCAP DOCKER KVM OVS DBUS"
+
+for rpm in `ls *.rpm`; do cp "$rpm" "/packages/${rpm/hsflowd/hsflowd-$1}"; done
+echo ""
+echo "files in /packages:"
+ls -l /packages
+

src/SunOS/Makefile

@@ -76,7 +76,7 @@ endif
 ifeq ($(JSON),yes)
 	JSONDIR=../json
 	CFLAGS += -DHSF_JSON -I$(JSONDIR)
-	LIBS += $(JSONDIR)/libjson.a -lm
+	LIBS += $(JSONDIR)/libcjson.a -lm
 endif
 
 #### BUILD ####

src/SunOS/hsflowd.h

@@ -341,7 +341,7 @@ extern "C" {
   void setApplicationPolling(HSPSFlowSettings *settings, char *app, uint32_t secs);
   void clearApplicationSettings(HSPSFlowSettings *settings);
   void lookupApplicationSettings(HSPSFlowSettings *settings, char *app, uint32_t *p_sampling, uint32_t *p_polling);
-  EnumIPSelectionPriority agentAddressPriority(HSP *sp, SFLAddress *addr, int vlan, int loopback);
+  uint32_t agentAddressPriority(HSP *sp, SFLAddress *addr, int vlan, int loopback);
   int selectAgentAddress(HSP *sp);
   void addAgentCIDR(HSPSFlowSettings *settings, HSPCIDR *cidr);
   void clearAgentCIDRs(HSPSFlowSettings *settings);