aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFritz Elfert <felfert@to.com>2003-02-03 08:29:26 +0000
committerFritz Elfert <felfert@to.com>2003-02-03 08:29:26 +0000
commit85fff6e07346b8c23c3aaf4d4e6581b5bf37585f (patch)
treeb7099f61f7c484224afb952272d24303e2a28ad4
parentdac5dc0039dabbe58b99afb0583fc10240723264 (diff)
downloadplptools-85fff6e07346b8c23c3aaf4d4e6581b5bf37585f.tar.gz
plptools-85fff6e07346b8c23c3aaf4d4e6581b5bf37585f.tar.bz2
plptools-85fff6e07346b8c23c3aaf4d4e6581b5bf37585f.zip
- Fixed ACK handling in ncpd.
- Fixed tar find routine in kpsion.
-rw-r--r--kde2/kpsion/kpsion.cpp2
-rw-r--r--ncpd/link.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp
index d00f1af..3a162b5 100644
--- a/kde2/kpsion/kpsion.cpp
+++ b/kde2/kpsion/kpsion.cpp
@@ -842,7 +842,7 @@ findTarEntry(const KTarEntry *te, QString path, QString rpath) {
if (tmp.length())
tmp += "/";
tmp += *f;
- fte = findTarEntry(td->entry(*f), path, unix2psion(tmp));
+ fte = findTarEntry(td->entry(*f), path, tmp);
if (fte != 0L)
break;
}
diff --git a/ncpd/link.cc b/ncpd/link.cc
index 6eec61c..9aab182 100644
--- a/ncpd/link.cc
+++ b/ncpd/link.cc
@@ -268,12 +268,12 @@ receive(bufferStore buff)
else
lout << " len=" << buff.getLen() << endl;
}
- sendAck((rxSequence+1) & seqMask);
if (((rxSequence + 1) & seqMask) == seq) {
rxSequence++;
rxSequence &= seqMask;
+ sendAck(rxSequence);
// Must check for XOFF/XON ncp frames HERE!
if ((buff.getLen() == 3) && (buff.getByte(0) == 0)) {
switch (buff.getByte(2)) {
@@ -300,6 +300,7 @@ receive(bufferStore buff)
theNCP->receive(buff);
} else {
+ sendAck(rxSequence);
if (verbose & LNK_DEBUG_LOG)
lout << "Link: DUP\n";
}