summaryrefslogtreecommitdiff
path: root/foreign
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2009-09-23 10:23:53 +0200
committerMartin Sustrik <sustrik@fastmq.commkdir>2009-09-23 10:23:53 +0200
commitb0a1a16fc2a84afa0eb2715f680297caef521b54 (patch)
treed95e61336f2a5553c6e4c40a03eb415289ea1092 /foreign
parent088a2db6746488c1ce4a73c357caaece50bbdf60 (diff)
parent25211307696752acc17e91783aa662dc9e423b21 (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'foreign')
-rw-r--r--foreign/openpgm/lost_data_tsi.patch76
1 files changed, 76 insertions, 0 deletions
diff --git a/foreign/openpgm/lost_data_tsi.patch b/foreign/openpgm/lost_data_tsi.patch
new file mode 100644
index 0000000..bfd4425
--- /dev/null
+++ b/foreign/openpgm/lost_data_tsi.patch
@@ -0,0 +1,76 @@
+--- libpgm-1.2.14/openpgm/pgm/transport.c 2009-08-27 04:54:04.000000000 +0200
++++ foreign/openpgm/libpgm-1.2.14/openpgm/pgm/transport.c 2009-09-22 14:36:07.713124619 +0200
+@@ -2342,6 +2342,7 @@
+ if (waiting_rxw->ack_cumulative_losses != waiting_rxw->cumulative_losses)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), waiting_rxw->identifier, sizeof (pgm_tsi_t));
+ waiting_rxw->pgm_sock_err.lost_count = waiting_rxw->cumulative_losses - waiting_rxw->ack_cumulative_losses;
+ waiting_rxw->ack_cumulative_losses = waiting_rxw->cumulative_losses;
+ }
+@@ -2705,6 +2706,7 @@
+ if (waiting_rxw->ack_cumulative_losses != waiting_rxw->cumulative_losses)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), waiting_rxw->identifier, sizeof (pgm_tsi_t));
+ waiting_rxw->pgm_sock_err.lost_count = waiting_rxw->cumulative_losses - waiting_rxw->ack_cumulative_losses;
+ waiting_rxw->ack_cumulative_losses = waiting_rxw->cumulative_losses;
+ }
+@@ -3407,6 +3409,7 @@
+ !sender_rxw->waiting_link.data)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), sender_rxw->identifier, sizeof (pgm_tsi_t));
+ sender_rxw->pgm_sock_err.lost_count = sender_rxw->cumulative_losses - sender_rxw->ack_cumulative_losses;
+ sender_rxw->ack_cumulative_losses = sender_rxw->cumulative_losses;
+
+@@ -3823,6 +3826,7 @@
+ !peer_rxw->waiting_link.data)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), peer_rxw->identifier, sizeof (pgm_tsi_t));
+ peer_rxw->pgm_sock_err.lost_count = peer_rxw->cumulative_losses - peer_rxw->ack_cumulative_losses;
+ peer_rxw->ack_cumulative_losses = peer_rxw->cumulative_losses;
+
+@@ -3952,6 +3956,7 @@
+ !peer_rxw->waiting_link.data)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), peer_rxw->identifier, sizeof (pgm_tsi_t));
+ peer_rxw->pgm_sock_err.lost_count = peer_rxw->cumulative_losses - peer_rxw->ack_cumulative_losses;
+ peer_rxw->ack_cumulative_losses = peer_rxw->cumulative_losses;
+
+@@ -4849,6 +4854,7 @@
+ !rxw->waiting_link.data)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), rxw->identifier, sizeof (pgm_tsi_t));
+ rxw->pgm_sock_err.lost_count = rxw->cumulative_losses - rxw->ack_cumulative_losses;
+ rxw->ack_cumulative_losses = rxw->cumulative_losses;
+
+@@ -5166,6 +5172,7 @@
+ !rxw->waiting_link.data)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), rxw->identifier, sizeof (pgm_tsi_t));
+ rxw->pgm_sock_err.lost_count = rxw->cumulative_losses - rxw->ack_cumulative_losses;
+ rxw->ack_cumulative_losses = rxw->cumulative_losses;
+
+@@ -5303,6 +5310,7 @@
+ !rxw->waiting_link.data)
+ {
+ transport->has_lost_data = TRUE;
++ memcpy (&(transport->lost_data_tsi), rxw->identifier, sizeof (pgm_tsi_t));
+ rxw->pgm_sock_err.lost_count = rxw->cumulative_losses - rxw->ack_cumulative_losses;
+ rxw->ack_cumulative_losses = rxw->cumulative_losses;
+
+--- libpgm-1.2.14/openpgm/pgm/include/pgm/transport.h 2009-08-27 04:53:23.000000000 +0200
++++ foreign/openpgm/libpgm-1.2.14/openpgm/pgm/include/pgm/transport.h 2009-09-21 15:49:36.000000000 +0200
+@@ -205,6 +205,7 @@
+ gboolean is_bound;
+ gboolean is_open;
+ gboolean has_lost_data;
++ pgm_tsi_t lost_data_tsi;
+ gboolean will_close_on_failure;
+
+ gboolean can_send_data; /* and SPMs */