Commit Graph

4438 Commits

Author SHA1 Message Date
Constantin Rack
bf14b1f906 Merge pull request #1680 from hintjens/master
Fixes for Windows, and poller API
2015-12-21 11:09:28 +01:00
Pieter Hintjens
6665bffe11 Problem: MSVC projects don't include timers.cpp/hpp
Solution: add these
2015-12-21 11:09:11 +01:00
Pieter Hintjens
7893a6ac26 Problem: zmq poller API is not CLASS conformant
Solution: change zmq_poller_close(p) to zmq_poller_destroy(&p)
2015-12-21 11:01:16 +01:00
Pieter Hintjens
f8b9ca5f42 Problem: zmq timers API is not CLASS conformant
If we're going to add CLASS-like APIs we should use the proper
syntax; specifically 'destroy' instead of 'close', which is a
hangover from the 'ZeroMQ is like sockets' model we're slowly
moving away from.

Solution: change zmq_timers_close(p) to zmq_timers_destroy(&p)
2015-12-21 10:56:37 +01:00
Pieter Hintjens
627809568b Problem: on Windows, link fails on missing Iphlpapi.lib
Solution: add to project dependencies
2015-12-21 10:52:40 +01:00
Pieter Hintjens
78c3ba0dc5 Merge pull request #1677 from c-rack/faster-git-clone
Problem: build scripts don't need full git history
2015-12-20 19:36:07 +01:00
Constantin Rack
d32cb1ae6f Merge pull request #1679 from hintjens/master
Problem: Windows build gives warning on v2_decoder.cpp:130
2015-12-20 19:30:11 +01:00
Pieter Hintjens
97092d994d Problem: Windows build gives warning on v2_decoder.cpp:130
Solution: add explicit cast
2015-12-20 19:13:49 +01:00
Constantin Rack
33c5985eb2 Problem: build scripts don't need full git history
Solution: add `--depth 1` parameter to `git clone` commands
2015-12-19 13:17:22 +01:00
Pieter Hintjens
4705feb2f4 Merge pull request #1676 from GreatFruitOmsk/master
CMAKE_VS_PLATFORM_TOOLSET may not be set.
2015-12-18 16:07:11 +01:00
Ilya Kulakov
0475c6dfd8 CMAKE_VS_PLATFORM_TOOLSET may not be set.
E.g. for nmake.
2015-12-18 20:50:41 +06:00
Constantin Rack
c19470ece1 Merge pull request #1675 from somdoron/Timers
Problem: no way to schedule timers with zmq_poll or zmq_poller
2015-12-18 11:34:39 +01:00
somdoron
aadaf99011 add timers API to libzmq 2015-12-18 12:23:22 +02:00
Pieter Hintjens
9ce8fe8f66 Merge pull request #1674 from GreatFruitOmsk/master
Add missing header for the if_nametoindex on Windows.
2015-12-18 10:57:46 +01:00
Ilya Kulakov
b76ccb8b1a Add missing header for the if_nametoindex on Windows. 2015-12-18 15:54:18 +06:00
Constantin Rack
066ff133f0 Merge pull request #1672 from GreatFruitOmsk/master
Fix redirecting location of pdb via CMAKE_PDB_OUTPUT_DIRECTORY.
2015-12-18 09:58:32 +01:00
Ilya Kulakov
923645060a Fix redirecting location of pdb via CMAKE_PDB_OUTPUT_DIRECTORY. 2015-12-18 14:52:17 +06:00
Constantin Rack
b67cdcfd0b Merge pull request #1670 from hintjens/master
CI was broken by #54799c (reverted)
2015-12-18 09:06:12 +01:00
Pieter Hintjens
987eb6ddc3 Merge pull request #1671 from brian-peloton/master
Fix alignment of initial chunk in yqueue
2015-12-17 21:10:35 +01:00
Brian Silverman
700b91d102 Fix alignment of initial chunk in yqueue
Clang's UndefinedBehaviorSanitizer catches this in the tests.
2015-12-17 14:28:15 -05:00
Pieter Hintjens
f3bcb73f02 Fixed old path to qt-android 2015-12-17 16:24:35 +01:00
Pieter Hintjens
31c35498af Revert "fixes #1565: Allow session to flush commands on an engine error"
This reverts commit 54799c8c6f.

This change broke the tests/test_shutdown_stress testcase.
2015-12-17 16:20:48 +01:00
KAPP Arnaud
768fc7699e Merge pull request #1668 from zoobab/master
Build success message + Build zmq for android with a Dockerfile
2015-12-17 14:12:26 +01:00
Benjamin Henrion
8f1810d1e2 Add a Dockerfile to build libzmq for android 2015-12-17 00:11:26 +01:00
Pieter Hintjens
819a879ff2 Merge pull request #1669 from bluca/travis_android
Problem: travis CI tries to build "qt-android"
2015-12-16 14:20:47 +01:00
Luca Boccassi
bd222d9206 Problem: travis CI tries to build "qt-android"
Solution: change .travis.yml to build "android" instead of "qt-android"
2015-12-16 13:11:45 +00:00
Constantin Rack
a9bad3bc13 Merge pull request #1665 from hintjens/master
Problem: builds/qt-android name is inaccurate
2015-12-14 19:59:51 +01:00
Pieter Hintjens
9b45ba7067 Problem: builds/qt-android name is inaccurate
Solution: rename to simple builds/android.
2015-12-14 19:01:13 +01:00
Constantin Rack
f00eb5aae6 Merge pull request #1664 from Kentzo/vmci
Add special interface to represent local VMCI context.
2015-12-14 14:31:05 +01:00
Ilya Kulakov
3caa637e1b Add special interface to represent local VMCI context. 2015-12-14 19:20:27 +06:00
Constantin Rack
301989614f Merge pull request #1663 from hurtonm/master 2015-12-11 15:36:12 +01:00
Martin Hurton
3ae5c55e46 Fix mailmap entry for Max Skaller 2015-12-11 15:26:42 +01:00
Martin Hurton
86efa67d97 Add mailmap entry for Chuck Remes 2015-12-11 15:26:19 +01:00
Pieter Hintjens
7eeb7d5e74 Merge pull request #1662 from hurtonm/master
Add mailmap file
2015-12-10 17:08:01 +01:00
Martin Hurton
d8af708ad9 Add mailmap file 2015-12-10 15:44:22 +01:00
Joe Eli McIlvain
c18904cbd2 Merge pull request #1659 from syenna/master
Add missing support for IPv6 link local addresses
2015-12-09 14:37:22 -08:00
Sathish Yenna
7cfa93352e Add missing support for IPv6 link local addresses (which include % followed by the interface name) 2015-12-09 16:26:34 -06:00
Constantin Rack
6eeef5eb7c Merge pull request #1658 from hintjens/master
Problem: zmq_vmci man page claims to be zmq_ipc man page
2015-12-09 10:47:36 +01:00
Constantin Rack
3cc7cfc015 Merge pull request #1657 from Kentzo/vmci
Don't build VMCI by default.
2015-12-09 10:47:19 +01:00
Ilya Kulakov
6ae70a9428 Remove unnecessray comment and unnecessary include. 2015-12-09 15:45:15 +06:00
Ilya Kulakov
141de87085 Fix a typo in reference to with_norm_ext. 2015-12-09 15:45:15 +06:00
Pieter Hintjens
4dcfb23e2e Problem: zmq_vmci man page claims to be zmq_ipc man page
Solution: fix this.
2015-12-09 10:45:12 +01:00
Constantin Rack
765fd20937 Merge pull request #1656 from bluca/vmci_include 2015-12-08 19:21:10 +01:00
Luca Boccassi
64ce6ca772 Problem: build fails, vmci enabled by default
Solution: disable vmci by default
Fixes issue #1655
2015-12-08 17:58:31 +00:00
Luca Boccassi
a556b500da Problem: build failure, vmci include out of IFDEF
Solution: do not include vmci header outside of vmci IFDEF
Fixes issue #1655
2015-12-08 17:53:31 +00:00
Pieter Hintjens
fc7e3bc3a4 Merge pull request #1654 from Kentzo/vmci
Add the VMCI transport.
2015-12-08 08:50:24 +01:00
Ilya Kulakov
68b13fbddb Add the VMCI transport.
VMCI transport allows fast communication between the Host
and a virtual machine, between virtual machines on the same host,
and within a virtual machine (like IPC).

It requires VMware to be installed on the host and Guest Additions
to be installed on a guest.
2015-12-08 13:16:09 +06:00
Pieter Hintjens
61f74e2dfc Merge pull request #1652 from chrisstaite/master
Adjust start of heartbeat timer
2015-11-30 21:32:37 +01:00
Chris
ba3cf3c006 Only start the heartbeat timer when the underlying mechanism is ready to stop cipher streams from trying to encrypt a heartbeat before the handshake has completed. Addresses issue #1601. 2015-11-30 20:18:25 +00:00
Pieter Hintjens
f6018e81d8 Merge pull request #1651 from wcs1only/master
fixes #1565: Allow session to flush commands on an engine error
2015-11-30 16:14:30 +01:00