void command_client::read_hello()
{
- istringstream hello(read_packet(hello_timeout_usec));
+ string resultpacket;
+ bool got_packet=false;
+ long long my_timeout=hello_timeout_usec;
+ while(!(got_packet=c.get_packet(resultpacket)) && my_timeout > 0 && !c.is_closed())
+ {
+ c.fill_buffer(my_timeout,&my_timeout);
+
+ c.peek_packet(resultpacket);
+ check_hello(resultpacket); // will throw before timeout if wrong data received
+ }
+
+ if (!got_packet)
+ throw t2n_transfer_error("timeout exceeded");
+
+ if (!check_hello(resultpacket))
+ throw t2n_version_mismatch("illegal hello received (incomplete): "+resultpacket);
+}
+
+bool command_client::check_hello(const string& hellostr)
+{
+ istringstream hello(hellostr);
- char chk[5];
- hello.read(chk,4);
- chk[4]=0;
- if (hello.fail() || hello.eof() || string("T2Nv") != chk)
- throw t2n_version_mismatch("illegal hello received (T2N)");
+ char chk;
+
+ if (hello.read(&chk,1))
+ {
+ if (chk != 'T')
+ throw t2n_version_mismatch("illegal hello received (T2N)");
+ }
+ else
+ return false;
+
+ if (hello.read(&chk,1))
+ {
+ if (chk != '2')
+ throw t2n_version_mismatch("illegal hello received (T2N)");
+ }
+ else
+ return false;
+
+ if (hello.read(&chk,1))
+ {
+ if (chk != 'N')
+ throw t2n_version_mismatch("illegal hello received (T2N)");
+ }
+ else
+ return false;
+
+ if (hello.read(&chk,1))
+ {
+ if (chk != 'v')
+ throw t2n_version_mismatch("illegal hello received (T2N)");
+ }
+ else
+ return false;
int prot_version;
- hello >> prot_version;
- if (hello.fail() || hello.eof() || prot_version != PROTOCOL_VERSION)
- throw t2n_version_mismatch("not compatible with the server protocol version");
+ if (hello >> prot_version)
+ {
+ if (prot_version != PROTOCOL_VERSION)
+ throw t2n_version_mismatch("not compatible with the server protocol version");
+ }
+ else
+ return false;
+
+ if (hello.read(&chk,1))
+ {
+ if (chk != ';')
+ throw t2n_version_mismatch("illegal hello received (1. ;)");
+ }
+ else
+ return false;
- hello.read(chk,1);
- if (hello.fail() || hello.eof() || chk[0] != ';')
- throw t2n_version_mismatch("illegal hello received (1. ;)");
+ unsigned int hbo;
+ if (hello.read((char*)&hbo,sizeof(hbo)))
+ {
+ if (hbo != 1)
+ throw t2n_version_mismatch("host byte order not matching");
+ }
+ else
+ return false;
- hello.read(chk,4);
- if (hello.fail() || hello.eof() || *((int*)chk) != 1)
- throw t2n_version_mismatch("host byte order not matching");
+ if (hello.read(&chk,1))
+ {
+ if (chk != ';')
+ throw t2n_version_mismatch("illegal hello received (2. ;)");
+ }
+ else
+ return false;
- hello.read(chk,1);
- if (hello.fail() || hello.eof() || chk[0] != ';')
- throw t2n_version_mismatch("illegal hello received (2. ;)");
+ return true;
}
void command_client::send_command(command* cmd, result_container &res)