Diffstat (limited to 'noncore/apps/opie-console/dialer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index ce2b688..8524422 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp @@ -84,26 +84,29 @@ Dialer::Dialer(const Profile& profile, int fd, QWidget *parent, const char *name Dialer::~Dialer() { } void Dialer::setHangupOnly() { state = state_cancel; usercancel = 1; + send("+++ATH\r"); } void Dialer::slotCancel() { if(state != state_online) { usercancel = 1; reset(); } - else accept(); + else { + accept(); + } } void Dialer::reset() { qWarning("reset"); switchState(state_cancel); } @@ -135,19 +138,19 @@ void Dialer::dial(const QString& number) void Dialer::trydial(const QString& number) { qWarning("TryDial:%s", number.latin1() ); if(state != state_cancel) switchState(state_preinit); if(cleanshutdown) { qWarning("HangupString " + m_profile.readEntry("HangupString")); - send(m_profile.readEntry("HangupString")); - //send("+++ATH"); - send(""); + //send(m_profile.readEntry("HangupString")); + send("+++ATH\r"); + //send(""); } if(state != state_cancel) { switchState(state_init); //send("ATZ"); qWarning("Init String " + m_profile.readEntry("InitString") ); // send(m_profile.readEntry("InitString", "AT")); @@ -182,33 +185,35 @@ void Dialer::trydial(const QString& number) if(state != state_cancel) { qWarning("progress"); switchState(state_dialing); send(QString("ATDT %1\r").arg(number)); // send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number)); QString response5 = receive(); - if(!response5.contains("\n" + m_profile.readEntry("DefaultConnect"))) + if(!response5.contains("CONNECT") ) { if(response5.contains("BUSY")) switchState(state_dialing); else { QMessageBox::warning(this, QObject::tr("Failure"), QObject::tr("Dialing the number failed.")); slotCancel(); } } } + if(state != state_cancel) { - switchState(state_online); + state = state_online; + slotCancel(); } } void Dialer::send(const QString& msg) { QString m = msg; int bytes; QString termination; @@ -241,24 +246,27 @@ QString Dialer::receive() { ret = ::read(m_fd, buffer, sizeof(buffer)); if(ret > 0) { for(int i = 0; i < ret; i++) buffer[i] = buffer[i] & 0x7F; buffer[ret] = 0; - //qWarning("Got: '%s'", buffer); + qWarning("Got: %s", buffer); buf.append(QString(buffer)); if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY"))) { //qWarning("Receiving: '%s'", buf.latin1()); cleanshutdown = 1; return buf; - } + }else if (buf.contains("NO CARRIER") || buf.contains("NO DIALTONE") ) { + cleanshutdown = 1; + return QString::null; + } } else if(ret < 0) { if(errno != EAGAIN) reset(); else if(!(counter++ % 100)) qApp->processEvents(); } else if(!(counter++ % 100)) qApp->processEvents(); |