Merge branch 'master' of git@github.com:sustrik/zeromq2

7 files changed, 49 insertions, 15 deletions

diff --git a/configure.in b/configure.in
index d498e86..a54df77 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
-AC_INIT([zeromq],[2.0-beta2],[http://www.zeromq.org])
+AC_INIT([zeromq],[dev],[http://www.zeromq.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(src/platform.hpp)
@@ -395,7 +395,7 @@ fi
 #  PGM extension
 pgm2_ext="no"
 
-pgm2_basename="libpgm-2.0.20rc5"
+pgm2_basename="libpgm-2.0.21rc6"
 
 AC_SUBST(pgm2_basename)
 
@@ -456,13 +456,13 @@ if test "x$with_pgm2_ext" != "xno"; then
 
     #  Generate galois_tables.c
     AC_CONFIG_COMMANDS([galois_tables2.c], 
-        [perl foreign/openpgm/libpgm-2.0.20rc5/openpgm/pgm/galois_generator.pl > \
-            foreign/openpgm/libpgm-2.0.20rc5/openpgm/pgm/galois_tables.c])
+        [perl foreign/openpgm/libpgm-2.0.21rc6/openpgm/pgm/galois_generator.pl > \
+            foreign/openpgm/libpgm-2.0.21rc6/openpgm/pgm/galois_tables.c])
 
     #  Generate version.c
     AC_CONFIG_COMMANDS([version2.c],
-        [python foreign/openpgm/libpgm-2.0.20rc5/openpgm/pgm/version_generator.py > \
-            foreign/openpgm/libpgm-2.0.20rc5/openpgm/pgm/version.c])
+        [python foreign/openpgm/libpgm-2.0.21rc6/openpgm/pgm/version_generator.py > \
+            foreign/openpgm/libpgm-2.0.21rc6/openpgm/pgm/version.c])
 
     #  Check for OpenPGM nedded libraries.
     PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0])
@@ -557,7 +557,7 @@ AM_CONDITIONAL(BUILD_QUEUE, test "x$queue" = "xyes")
 AM_CONDITIONAL(BUILD_PERF, test "x$perf" = "xyes")
 AM_CONDITIONAL(BUILD_CHAT, test "x$chat" = "xyes")
 AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes")
-AM_CONDITIONAL(BUILD_PGM2_EXAMPLES, test "x$with_pgm2_ext" = "xyes")
+AM_CONDITIONAL(BUILD_PGM2_EXAMPLES, test "x$with_pgm2_examples" = "xyes")
 AM_CONDITIONAL(INSTALL_MAN, test "x$install_man" = "xyes")
 
 AC_SUBST(stdint)
diff --git a/foreign/openpgm/libpgm-2.0.20rc5.tar.bz2 b/foreign/openpgm/libpgm-2.0.20rc5.tar.bz2
deleted file mode 100644
index f914a2b..0000000
--- a/foreign/openpgm/libpgm-2.0.20rc5.tar.bz2
+++ /dev/null
diff --git a/foreign/openpgm/libpgm-2.0.21rc6.tar.bz2 b/foreign/openpgm/libpgm-2.0.21rc6.tar.bz2
new file mode 100644
index 0000000..d8a5ba1
--- /dev/null
+++ b/foreign/openpgm/libpgm-2.0.21rc6.tar.bz2
diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am
index b810afe..9ab50a5 100644
--- a/perf/c/Makefile.am
+++ b/perf/c/Makefile.am
@@ -31,6 +31,8 @@ pgmexamples_diff_flags = \
     -DCONFIG_BIND_INADDR_ANY \
     -DCONFIG_GALOIS_MUL_LUT \
     -DIF_NAMESIZE=256 \
+    -DPGM_GNUC_INTERNAL=G_GNUC_INTERNAL \
+    -DCONFIG_HAVE_WSACMSGHDR \
     -DGETTEXT_PACKAGE='"pgm"' \
     -DG_LOG_DOMAIN='"Pgm"'
 
@@ -53,6 +55,11 @@ pgmexamples_diff_flags = \
     -DCONFIG_HAVE_GETPROTOBYNAME_R \
     -DCONFIG_BIND_INADDR_ANY \
     -DCONFIG_GALOIS_MUL_LUT \
+    -DCONFIG_HAVE_MCAST_JOIN \
+    -DCONFIG_HAVE_IP_MREQN \
+    -DCONFIG_HAVE_SPRINTF_GROUPING \
+    -DCONFIG_HAVE_HPET \
+    -DPGM_GNUC_INTERNAL=G_GNUC_INTERNAL \
     -DGETTEXT_PACKAGE='"pgm"' \
     -DG_LOG_DOMAIN='"Pgm"'
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index bd6748a..6957ff0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,8 @@ pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/wsastrerror.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/glib-compat.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/backtrace.c \
-    ../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c
+    ../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c \
+    ../foreign/openpgm/@pgm_basename@/openpgm/pgm/sockaddr.c
 endif
 
 nodist_libzmq_la_SOURCES = $(pgm_sources)
@@ -170,7 +171,6 @@ libzmq_la_SOURCES = app_thread.hpp \
 libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAFS@
 
 if BUILD_PGM2
-libzmq_la_CXXFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ -Wall @LIBZMQ_EXTRA_CXXFLAGS@
 
 if ON_MINGW
 libpgm_diff_flags = \
@@ -179,6 +179,8 @@ libpgm_diff_flags = \
     -DCONFIG_BIND_INADDR_ANY \
     -DCONFIG_GALOIS_MUL_LUT \
     -DIF_NAMESIZE=256 \
+    -DPGM_GNUC_INTERNAL=G_GNUC_INTERNAL \
+    -DCONFIG_HAVE_WSACMSGHDR \
     -DGETTEXT_PACKAGE='"pgm"' \
     -DG_LOG_DOMAIN='"Pgm"'
 
@@ -201,6 +203,11 @@ libpgm_diff_flags = \
     -DCONFIG_HAVE_GETPROTOBYNAME_R \
     -DCONFIG_BIND_INADDR_ANY \
     -DCONFIG_GALOIS_MUL_LUT \
+    -DCONFIG_HAVE_MCAST_JOIN \
+    -DCONFIG_HAVE_IP_MREQN \
+    -DCONFIG_HAVE_SPRINTF_GROUPING \
+    -DCONFIG_HAVE_HPET \
+    -DPGM_GNUC_INTERNAL=G_GNUC_INTERNAL \
     -DGETTEXT_PACKAGE='"pgm"' \
     -DG_LOG_DOMAIN='"Pgm"'
 endif
@@ -233,6 +240,9 @@ libzmq_la_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/in
     -D_REENTRANT \
     -D_GNU_SOURCE \
     ${libpgm_diff_flags}
+
+libzmq_la_CXXFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ \
+    -Wall @LIBZMQ_EXTRA_CXXFLAGS@ ${libpgm_diff_flags}
 endif
 
 if BUILD_NO_PGM
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index 11084ff..4d713e3 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -27,8 +27,6 @@
 
 #ifdef ZMQ_HAVE_LINUX
 #include <poll.h>
-//  Has to be defined befiore including pgm/pgm.h
-#define CONFIG_HAVE_POLL
 #endif
 
 #include <stdlib.h>
@@ -88,10 +86,25 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
     //  Note that if you want to use gettimeofday and sleep for openPGM timing,
     //  set environment variables PGM_TIMER to "GTOD" 
     //  and PGM_SLEEP to "USLEEP".
-    int rc = pgm_init ();
-    if (rc != 0) {
-        errno = EINVAL;
-        return -1;
+    int rc = pgm_init (&pgm_error);
+    if (rc != TRUE) {
+
+        if (pgm_error->domain == PGM_IF_ERROR && (
+              pgm_error->code == PGM_IF_ERROR_INVAL ||
+              pgm_error->code == PGM_IF_ERROR_XDEV ||
+              pgm_error->code == PGM_IF_ERROR_NODEV ||
+              pgm_error->code == PGM_IF_ERROR_NOTUNIQ ||
+              pgm_error->code == PGM_IF_ERROR_ADDRFAMILY ||
+              pgm_error->code == PGM_IF_ERROR_FAMILY ||
+              pgm_error->code == PGM_IF_ERROR_NODATA ||
+              pgm_error->code == PGM_IF_ERROR_NONAME ||
+              pgm_error->code == PGM_IF_ERROR_SERVICE)) {
+            errno = EINVAL;
+	        g_error_free (pgm_error);
+            return -1;
+        }
+
+        zmq_assert (false);
     }
 
     //  PGM transport GSI.
diff --git a/src/windows.hpp b/src/windows.hpp
index 7cb9291..81c4d38 100644
--- a/src/windows.hpp
+++ b/src/windows.hpp
@@ -65,4 +65,8 @@
 #include <ipexport.h>
 #include <process.h>
 
+//  On mingw environment AI_NUMERICSERV is not defined, needed in ip.cpp.
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0x0400
+#endif
 #endif