diff options
| author | Fritz Elfert <felfert@to.com> | 2002-08-11 01:41:45 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2002-08-11 01:41:45 +0000 |
| commit | 0df34ec5ddb92ce7e3bcbb4f0eb24e30955ba3a1 (patch) | |
| tree | bf25a83298b223ea71428b1453f3b3a04de902ef /ncpd | |
| parent | 8a6406733e385afc86d9937ff79f228ef40afc99 (diff) | |
| download | plptools-0df34ec5ddb92ce7e3bcbb4f0eb24e30955ba3a1.tar.gz plptools-0df34ec5ddb92ce7e3bcbb4f0eb24e30955ba3a1.tar.bz2 plptools-0df34ec5ddb92ce7e3bcbb4f0eb24e30955ba3a1.zip | |
- Fixed setting of CFLAGS and CXXFLAGS: With --enable-debug, disable -O
- Removed ccmalloc support. Now using valgrind
- Added missing mainainer-clean-local targets
- Fixed uninitialized array in IOwatch, reported by valgrind.
- Fixed missing definition of LC_ALL if compiling without -O
- Fixed invalid access to datapump thread (not yet created), reported by
valgrind.
- Fixed wrong parameters of QRegExp when using QT 3.x
- Fixed KTar initialization which has changed in KDE 3.x
Diffstat (limited to 'ncpd')
| -rw-r--r-- | ncpd/Makefile.am | 2 | ||||
| -rw-r--r-- | ncpd/packet.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ncpd/Makefile.am b/ncpd/Makefile.am index b06edb3..0338e97 100644 --- a/ncpd/Makefile.am +++ b/ncpd/Makefile.am @@ -6,7 +6,7 @@ CXXFLAGS = $(THREADED_CXXFLAGS) sbin_PROGRAMS = ncpd -ncpd_LDADD = $(top_srcdir)/lib/libplp.la -lpthread $(LIBCCMALLOC_CXX) +ncpd_LDADD = $(top_srcdir)/lib/libplp.la -lpthread ncpd_SOURCES = channel.cc link.cc linkchan.cc main.cc \ ncp.cc packet.cc socketchan.cc mp_serial.c EXTRA_DIST = channel.h link.h linkchan.h main.h mp_serial.h ncp.h packet.h \ diff --git a/ncpd/packet.cc b/ncpd/packet.cc index 31eafd0..d352fc9 100644 --- a/ncpd/packet.cc +++ b/ncpd/packet.cc @@ -222,8 +222,10 @@ reset() } outRead = outWrite = 0; internalReset(); - if (fd != -1) + if (fd != -1) { pthread_create(&datapump, NULL, pump_run, this); + realWrite(); + } } void packet:: @@ -254,10 +256,8 @@ internalReset() if (verbose & PKT_DEBUG_LOG) lout << "serial connection set to " << dec << realBaud << " baud, fd=" << fd << endl; - if (fd != -1) { + if (fd != -1) lastFatal = false; - realWrite(); - } } short int packet:: @@ -465,7 +465,7 @@ findSync() int rx_amount = (inw > inRead) ? inw - inRead : BUFLEN - inRead + inw; if (rx_amount > 15) - internalReset(); + reset(); } } } |