From 82a51ca6e15b118d4c979f07f22837f2dab1b782 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Sat, 15 Dec 2012 00:40:41 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 22 ---------------------- patches/udpong | 6 +++--- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f897b70d..2aa591a4 100644 --- a/meta +++ b/meta @@ -1,10 +1,9 @@ Version: 1 -Previous: f38e01ec8f51cc154676888fff7cbbeee3210a86 -Head: ac330dd8bd302cb6123355c465a5d15085d0f801 +Previous: 23800b9ddd2c2a60f7945eff59cb401632e96823 +Head: 342b04b1773e2e80607914cc7260080f7bf93d9f Applied: dsocket: e7e16224fd7e40798f5288261284b14fe0093f72 - udpong: fa6e6e527c5268038b8121b58ee297323cd2ee30 - refresh-temp: ac330dd8bd302cb6123355c465a5d15085d0f801 + udpong: 342b04b1773e2e80607914cc7260080f7bf93d9f Unapplied: test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7 iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 01f3a91f..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: 6f9f91ab484e485a49497024fdfd602b3f868fbc -Top: 00c32d703a94a66f770fd892898d28fe8d8cbee7 -Author: Sean Hefty -Date: 2012-12-15 00:40:41 -0800 - -Refresh of udpong - ---- - -diff --git a/examples/udpong.c b/examples/udpong.c -index 3b0f961..2e3de3e 100644 ---- a/examples/udpong.c -+++ b/examples/udpong.c -@@ -365,7 +365,7 @@ static int client_send_recv(struct message *msg, size_t size, int timeout) - return ret; - - ret = client_recv(msg, size, timeout); -- } while (ret <= 0 && msg->seqno != seqno); -+ } while (ret <= 0 || msg->seqno != seqno); - - seqno++; - return ret; diff --git a/patches/udpong b/patches/udpong index f70a6ea1..6457b66c 100644 --- a/patches/udpong +++ b/patches/udpong @@ -1,5 +1,5 @@ Bottom: 118b72bdf8de5351caaf3d746984f9e4401d4253 -Top: 6f9f91ab484e485a49497024fdfd602b3f868fbc +Top: 00c32d703a94a66f770fd892898d28fe8d8cbee7 Author: Sean Hefty Date: 2012-12-05 15:58:03 -0800 @@ -584,7 +584,7 @@ index 069b7c9..617710e 100644 diff --git a/examples/udpong.c b/examples/udpong.c new file mode 100644 -index 0000000..3b0f961 +index 0000000..2e3de3e --- /dev/null +++ b/examples/udpong.c @@ -0,0 +1,581 @@ @@ -955,7 +955,7 @@ index 0000000..3b0f961 + return ret; + + ret = client_recv(msg, size, timeout); -+ } while (ret <= 0 && msg->seqno != seqno); ++ } while (ret <= 0 || msg->seqno != seqno); + + seqno++; + return ret; -- 2.46.0