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

.gitignore

-COPYING
 INSTALL
 Makefile
 Makefile.in
@@ -17,7 +16,7 @@ autom4te.cache
 *.pdf
 *.ps
 .*
-src/platform.hpp
+src/platform.hpp*
 src/stamp-h1
 devices/zmq_forwarder/zmq_forwarder
 devices/zmq_queue/zmq_queue
@@ -37,3 +36,7 @@ doc/*.3
 doc/*.7
 doc/*.html
 doc/*.xml
+bindings/python/setup.py
+src/libzmq.pc
+foreign/openpgm/*
+!foreign/openpgm/*.tar.bz2

AUTHORS

@@ -33,6 +33,7 @@ Aamir Mohammad
 Alexander Majorov
 Bernd Schumacher
 Brett Cameron
+Brian Granger
 Carsten Dinkelmann
 David Bahi
 Dirk Eddelbuettel

Makefile.am

@@ -8,9 +8,12 @@ SUBDIRS = src doc $(DIR_PERF) devices bindings examples
 DIST_SUBDIRS = src doc perf devices bindings examples
 
 EXTRA_DIST = \
-$(top_srcdir)/foreign/openpgm/@pgm2_basename@.tar.bz2 \
+$(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2 \
 $(top_srcdir)/foreign/xmlParser/xmlParser.cpp \
 $(top_srcdir)/foreign/xmlParser/xmlParser.hpp
 
 dist-hook:
-		-rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@
+		-rm -rf $(distdir)/foreign/openpgm/@pgm_basename@
+clean-local:
+		-rm -rf $(top_srcdir)/foreign/openpgm/@pgm_basename@
+

bindings/c/zmq.h

@@ -195,6 +195,7 @@ ZMQ_EXPORT int zmq_recv (void *s, zmq_msg_t *msg, int flags);
 
 #define ZMQ_POLLIN 1
 #define ZMQ_POLLOUT 2
+#define ZMQ_POLLERR 4
 
 typedef struct
 {

bindings/java/Makefile.am

@@ -17,19 +17,20 @@ dist_noinst_JAVA = \
 lib_LTLIBRARIES = libjzmq.la
 libjzmq_la_SOURCES = \
 	Context.cpp \
-    org_zmq_Context.h \
-	Socket.cpp \
-    org_zmq_Socket.h
+	Socket.cpp
+nodist_libjzmq_la_SOURCES = \
+	org_zmq_Context.h \
+	org_zmq_Socket.h
 
 libjzmq_la_CXXFLAGS = @JAVA_INCLUDE@ -I$(top_srcdir)/bindings/c -Wall
 libjzmq_la_LDFLAGS = -version-info @JLTVER@
 libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la
 
 BUILT_SOURCES = \
-    org/zmq/Context.class \
-    org_zmq_Context.h \
+	org/zmq/Context.class \
+	org_zmq_Context.h \
 	org/zmq/Socket.class \
-    org_zmq_Socket.h
+	org_zmq_Socket.h
 
 CLEANFILES = \
 	org/zmq/Context.class \

doc/zmq_poll.txt

@@ -49,7 +49,8 @@ infinite timeout.
 
 RETURN VALUE
 ------------
-Function returns number of items signaled or -1 in the case of error.
+Function returns number of items signaled, 0 in the case of timeout or -1
+in the case of error.
 
 
 ERRORS

perf/c/Makefile.am

 INCLUDES = -I$(top_builddir)/bindings/c
 
-if BUILD_PGM2_EXAMPLES
+if BUILD_PGM_EXAMPLES
 PGM_EXAMPLES_BINS = pgmsend pgmrecv
 endif
 
@@ -22,7 +22,7 @@ remote_thr_LDADD = $(top_builddir)/src/libzmq.la
 remote_thr_SOURCES = remote_thr.c
 remote_thr_CXXFLAGS = -Wall -pedantic -Werror
 
-if BUILD_PGM2_EXAMPLES
+if BUILD_PGM_EXAMPLES
 
 if ON_MINGW
 pgmexamples_diff_flags = \
@@ -64,7 +64,7 @@ pgmexamples_diff_flags = \
     -DG_LOG_DOMAIN='"Pgm"'
 endif
 
-pgmsend_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmsend.c
+nodist_pgmsend_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmsend.c
 pgmsend_LDADD = $(top_builddir)/src/libzmq.la
 pgmsend_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ -Wall @LIBZMQ_EXTRA_CXXFLAGS@ \
     -pipe \
@@ -95,7 +95,7 @@ pgmsend_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/incl
     -D_GNU_SOURCE \
     ${pgmexamples_diff_flags}
 
-pgmrecv_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmrecv.c
+nodist_pgmrecv_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmrecv.c
 pgmrecv_LDADD = $(top_builddir)/src/libzmq.la
 pgmrecv_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ -Wall @LIBZMQ_EXTRA_CXXFLAGS@ \
     -pipe \

src/Makefile.am

@@ -15,7 +15,7 @@ include_HEADERS = ../bindings/c/zmq.h
 endif
 endif
 
-if BUILD_PGM2
+if BUILD_PGM
 pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/time.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/if.c \
@@ -49,6 +49,12 @@ pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/sockaddr.c \
     ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c
+
+../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py
+	python ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py > $@
+
+../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_tables.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl
+	perl ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl > $@
 endif
 
 nodist_libzmq_la_SOURCES = $(pgm_sources)
@@ -173,9 +179,9 @@ libzmq_la_SOURCES = app_thread.hpp \
     zmq_init.cpp \
     zmq_listener.cpp
 
-libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAFS@
+libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
 
-if BUILD_PGM2
+if BUILD_PGM
 
 if ON_MINGW
 libpgm_diff_flags = \

src/ip.cpp

@@ -239,7 +239,11 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_,
 
     //  Restrict hostname/service to literals to avoid any DNS lookups or
     //  service-name irregularity due to indeterminate socktype.
-    req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV;
+#if defined ZMQ_HAVE_OSX
+   req.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
+#else
+   req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV;
+#endif 
 
     //  Resolve the literal address. Some of the error info is lost in case
     //  of error, however, there's no way to report EAI errors via errno.
@@ -288,7 +292,11 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_,
     
     //  Avoid named services due to unclear socktype, and don't pick IPv6
     //  addresses if we don't have a local IPv6 address configured.
-    req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG;
+#if defined ZMQ_HAVE_OSX
+   req.ai_flags = AI_ADDRCONFIG;
+#else
+   req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG;
+#endif 
 
     //  Resolve host name. Some of the error info is lost in case of error,
     //  however, there's no way to report EAI errors via errno.