diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-29 19:07:27 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-29 19:07:27 -0500 |
| commit | 67f0b146ecc82da4511bfe72bdbe4f850c263d8c (patch) | |
| tree | f41dd17e138fbf3361cfe03479cedb862fcee5ce /servers | |
| parent | 1f8f9ca9434d9e2c0d7e7e061b7177009fd504df (diff) | |
| download | ulab-67f0b146ecc82da4511bfe72bdbe4f850c263d8c.tar.gz ulab-67f0b146ecc82da4511bfe72bdbe4f850c263d8c.zip | |
Add helper functions to krb sockets
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/auth_server_lin/src/auth_conn.cpp | 8 | ||||
| -rw-r--r-- | servers/fpga_server_lin/src/fpga_conn.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/servers/auth_server_lin/src/auth_conn.cpp b/servers/auth_server_lin/src/auth_conn.cpp index 65c131f..177a0e3 100644 --- a/servers/auth_server_lin/src/auth_conn.cpp +++ b/servers/auth_server_lin/src/auth_conn.cpp @@ -193,7 +193,7 @@ void AuthSocket::servLoop() { m_servClientTimeout->start(5000, TRUE); } if (m_servClientSocket->state() == TQSocket::Connected) { - if (m_servClientSocket->canReadLine()) { + if (m_servClientSocket->canReadData()) { TQDataStream clientDS(m_servClientSocket); TQString server_reply; @@ -237,11 +237,11 @@ void AuthSocket::servLoop() { TQByteArray ba(8192); TQ_ULONG reclen; - if (canReadLine()) { + if (canReadData()) { reclen = readBlock(ba.data(), 8192); m_servClientSocket->writeBlock(ba.data(), reclen); } - if (m_servClientSocket->canReadLine()) { + if (m_servClientSocket->canReadData()) { reclen = m_servClientSocket->readBlock(ba.data(), 8192); writeBlock(ba.data(), reclen); } @@ -267,7 +267,7 @@ void AuthSocket::commandLoop() { m_criticalSection++; try { if (state() == TQSocket::Connected) { - if (canReadLine()) { + if (canReadData()) { TQString command; TQDataStream ds(this); diff --git a/servers/fpga_server_lin/src/fpga_conn.cpp b/servers/fpga_server_lin/src/fpga_conn.cpp index b1b0451..f0ab39d 100644 --- a/servers/fpga_server_lin/src/fpga_conn.cpp +++ b/servers/fpga_server_lin/src/fpga_conn.cpp @@ -166,7 +166,7 @@ void FPGASocket::commandLoop() { writeBlock(buffer, cc); printf("[DEBUG] Got %d bytes from the serial port\n\r", cc); fflush(stdout); } - if (canReadLine()) { + if (canReadData()) { cc = readBlock(buffer, 10000); if (cc > 0) { if (write(m_fd_tty, buffer, cc) < 0) { |