jessica
/
Jupiter
mirror of https://github.com/JAJames/Jupiter.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Channged connectionStatus check to a switch.

release/0.19
JustinAJ 10 years ago
parent
b63c3e9be8
commit
9e9ffc070d
1 changed files with 16 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      Jupiter/IRC_Client.cpp

28
Jupiter/IRC_Client.cpp
View File

@ -604,8 +604,9 @@ int Jupiter::IRC::Client::primaryHandler()
} }
break; break;
} // numeric switch } // numeric switch
if (Jupiter::IRC::Client::data_->connectionStatus == 1) // Socket established -- attempting STARTTLS switch (Jupiter::IRC::Client::data_->connectionStatus)
{ {
case 1: // Socket established -- attempting STARTTLS
switch (numeric) switch (numeric)
{ {
case IRC_RPL_BOUNCEOLD: // 005 case IRC_RPL_BOUNCEOLD: // 005
@ -689,9 +690,9 @@ int Jupiter::IRC::Client::primaryHandler()
default: default:
break; break;
} // numeric switch } // numeric switch
} break;
else if (Jupiter::IRC::Client::data_->connectionStatus == 2) // Capability negotiation
{ case 2: // Capability negotiation
switch (numeric) switch (numeric)
{ {
case 0: case 0:
@ -748,8 +749,9 @@ int Jupiter::IRC::Client::primaryHandler()
default: default:
break; break;
} // numeric switch } // numeric switch
} break;
else if (Jupiter::IRC::Client::data_->connectionStatus == 3) // Registration sent, but not verified.
case 3: // Registration sent, but not verified.
{ {
bool completelyBadNick = false; bool completelyBadNick = false;
switch (numeric) switch (numeric)
@ -764,7 +766,7 @@ int Jupiter::IRC::Client::primaryHandler()
break; break;
// You have a bad nickname! Try the alt. // You have a bad nickname! Try the alt.
//case IRC_ERR_NONICKNAMEGIVEN: // 431 -- Not consistently usable due to lack of command field. //case IRC_ERR_NONICKNAMEGIVEN: // 431 -- Not consistently usable due to lack of command field.
case IRC_ERR_ERRONEOUSNICKNAME: // 432 case IRC_ERR_ERRONEOUSNICKNAME: // 432
completelyBadNick = true; completelyBadNick = true;
case IRC_ERR_NICKNAMEINUSE: // 433 case IRC_ERR_NICKNAMEINUSE: // 433
@ -820,8 +822,9 @@ int Jupiter::IRC::Client::primaryHandler()
break; break;
} }
} }
else if (Jupiter::IRC::Client::data_->connectionStatus == 4) // Registration verified, but connection process in progress. break;
{
case 4: // Registration verified, but connection process in progress.
switch (numeric) switch (numeric)
{ {
case IRC_RPL_ISUPPORT: // 005 case IRC_RPL_ISUPPORT: // 005
@ -904,9 +907,9 @@ int Jupiter::IRC::Client::primaryHandler()
} }
break; break;
} }
} break;
else // Post-registration.
{ default: // Post-registration.
if (streqli(w2.c_str(), "PRIVMSG")) if (streqli(w2.c_str(), "PRIVMSG"))
{ {
Jupiter::CStringS chan = buff.getWord(2, WHITESPACE); Jupiter::CStringS chan = buff.getWord(2, WHITESPACE);
@ -1200,6 +1203,7 @@ int Jupiter::IRC::Client::primaryHandler()
if (i >= 0) Jupiter::IRC::Client::data_->channels.get(i)->data_->isAddingNames = false; if (i >= 0) Jupiter::IRC::Client::data_->channels.get(i)->data_->isAddingNames = false;
} }
} }
break;
} }
} }
else else

Write Preview
Loading…
Cancel
Save