summaryrefslogtreecommitdiff
path: root/comms/pilot-link
diff options
context:
space:
mode:
authordillo <dillo>2002-01-30 10:05:13 +0000
committerdillo <dillo>2002-01-30 10:05:13 +0000
commit551bf38be9ab136a78568df7693540660aec9ffe (patch)
tree7cb784496790826556f844b6f5913db631364553 /comms/pilot-link
parentb5ff5c182fb588931b2b4c8a64a9be981d43ffbd (diff)
downloadpkgsrc-551bf38be9ab136a78568df7693540660aec9ffe.tar.gz
update pilot-link-libs to 0.9.5nb2:
fix error recovery (in SLP and PADP protocols)
Diffstat (limited to 'comms/pilot-link')
-rw-r--r--comms/pilot-link/distinfo4
-rw-r--r--comms/pilot-link/patches/patch-ae21
-rw-r--r--comms/pilot-link/patches/patch-af29
3 files changed, 53 insertions, 1 deletions
diff --git a/comms/pilot-link/distinfo b/comms/pilot-link/distinfo
index e1006b87651..b6251852e6e 100644
--- a/comms/pilot-link/distinfo
+++ b/comms/pilot-link/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/10/23 20:46:46 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/01/30 10:05:13 dillo Exp $
SHA1 (pilot-link.0.9.5.tar.bz2) = cb026637bebad22a273b38edfd8633853d13e065
Size (pilot-link.0.9.5.tar.bz2) = 424794 bytes
@@ -6,3 +6,5 @@ SHA1 (patch-aa) = 17e0beeb35335b8ed0d2fe06e67327be82ad5148
SHA1 (patch-ab) = 098d934009c87949a4d6f3dbaed78c9803df1029
SHA1 (patch-ac) = 5d37048f9524e8d96b387c4ee22b4f91d4d4b6d7
SHA1 (patch-ad) = 4b2673db8f1ed28ab8e29a5d43dcecd44f0ec7d6
+SHA1 (patch-ae) = 8f28d723dda9347817a4089bd7629895e1240494
+SHA1 (patch-af) = 4033574cf8373fdb6f44dd3ddb75e9d8d867c023
diff --git a/comms/pilot-link/patches/patch-ae b/comms/pilot-link/patches/patch-ae
new file mode 100644
index 00000000000..9cb83241ab4
--- /dev/null
+++ b/comms/pilot-link/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2002/01/30 10:05:13 dillo Exp $
+
+diff -r -u pilot-link.0.9.5/libsock/padp.c work/pilot-link.0.9.5/libsock/padp.c
+--- libsock/padp.c.orig Tue Jun 19 07:50:11 2001
++++ libsock/padp.c Wed Jan 30 10:09:18 2002
+@@ -173,13 +173,13 @@
+ && (padp.type ==
+ (unsigned char) padData)
+ && (slp->id == ps->xid)
+- && (len == 0)) {
++ && (len == count+tlen)) {
+ fprintf(stderr, "Missing ack\n");
+ /* Incoming padData from response to
+ this transmission. Maybe the Ack
+ was lost */
+ /* Don't consume packet, and return success. */
+- count = 0;
++ count = len;
+ goto done;
+ return 0;
+ } else if (padp.type == (unsigned char) 4) {
diff --git a/comms/pilot-link/patches/patch-af b/comms/pilot-link/patches/patch-af
new file mode 100644
index 00000000000..bed4f74766e
--- /dev/null
+++ b/comms/pilot-link/patches/patch-af
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1 2002/01/30 10:05:13 dillo Exp $
+
+diff -r -u pilot-link.0.9.5/libsock/slp.c work/pilot-link.0.9.5/libsock/slp.c
+--- libsock/slp.c.orig Wed Jun 6 10:16:56 2001
++++ libsock/slp.c Wed Jan 30 09:44:42 2002
+@@ -136,6 +141,8 @@
+ ps->mac->state++;
+ ps->mac->expect = 1;
+ ps->mac->buf++;
++ } else if (v == 0xbe) {
++ ps->mac->expect = 1;
+ }
+ break;
+
+@@ -143,9 +155,14 @@
+ if (v == 0xed) {
+ /* OK. we think we're sync'ed, so go for the rest
+ of the header */
+ ps->mac->state++;
+ ps->mac->expect = 7;
+ ps->mac->buf++;
++ } else if (v == 0xbe) {
++ --ps->mac->buf;
++ ps->mac->buf[-1] = v;
++ ps->mac->expect = 1;
++ ps->mac->state = 2;
+ }
+ break;
+