epoll init

This commit is contained in:
Krzysztof Kwiatkowski 2013-12-26 20:59:01 +01:00
parent f6b77e1b27
commit aea977d6ea
13 changed files with 371146 additions and 20 deletions

1
withepoll/Makefile Normal file
View File

@ -0,0 +1 @@

View File

@ -103,7 +103,7 @@ void Client::receive()
memset(buf,'\0',MAX_PACKET_SIZE); memset(buf,'\0',MAX_PACKET_SIZE);
int len_rcv = 0; int len_rcv = 0;
{ {
bool flag = true; bool flag = 1;
while( flag ) while( flag )
{ {
lock_guard<mutex> lock(WriteReadMutex); lock_guard<mutex> lock(WriteReadMutex);
@ -111,6 +111,10 @@ void Client::receive()
len_rcv = SSL_read(SSLHandler, buf, MAX_PACKET_SIZE); len_rcv = SSL_read(SSLHandler, buf, MAX_PACKET_SIZE);
// cout << "SSL_read: stop" << endl; // cout << "SSL_read: stop" << endl;
flag = handle_error_code(len_rcv, SSLHandler, len_rcv, "SSL_read"); flag = handle_error_code(len_rcv, SSLHandler, len_rcv, "SSL_read");
if( !flag )
flag = SSL_pending(SSLHandler);
cout << "PENDING: " << flag << endl;
} }
} }
@ -223,8 +227,7 @@ void Client::renegotiate()
exit(1); exit(1);
} }
} }
cout << "SSL State: " << SSL_state_string(SSLHandler) << endl;
// cout << "SSL State: " << SSL_state_string(SSLHandler) << endl;
// if(SSL_do_handshake(SSLHandler) <= 0){ // if(SSL_do_handshake(SSLHandler) <= 0){
// cerr << "SSL_do_handshake() failed. STATE: " // cerr << "SSL_do_handshake() failed. STATE: "
// << SSL_state_string(SSLHandler) << endl; // << SSL_state_string(SSLHandler) << endl;

View File

@ -1,5 +1,5 @@
#define MAX_PACKET_SIZE 1024 #define MAX_PACKET_SIZE 1024
#define PORT 1420 #define PORT 5061
#define IP "127.0.0.1" #define IP "127.0.0.1"
#define EXCHANGE_STRING "ABCDEFGHIJKLMNOPRSTUWXYZ" #define EXCHANGE_STRING "ABCDEFGHIJKLMNOPRSTUWXYZ"
#define EXCHANGE_STRING_LEN sizeof(EXCHANGE_STRING)/sizeof(EXCHANGE_STRING[0]) #define EXCHANGE_STRING_LEN sizeof(EXCHANGE_STRING)/sizeof(EXCHANGE_STRING[0])

371114
withselect/out Normal file

File diff suppressed because it is too large Load Diff

View File

@ -268,8 +268,14 @@ void Receive()
cout << SSL_state_string(handler.second) << endl; cout << SSL_state_string(handler.second) << endl;
{ {
lock_guard<mutex> lock(WriteReadMutex); lock_guard<mutex> lock(WriteReadMutex);
int flag = 1;
while( flag!=0 )
{
cout << "SSL_read: start" << endl; cout << "SSL_read: start" << endl;
len_rcv = SSL_read(handler.second, buf, 1024); len_rcv = SSL_read(handler.second, buf, 1024);
flag = SSL_pending(handler.second);
cout << "PENDING: " << flag << endl;
// cout << "SSL_read: stop" << endl; // cout << "SSL_read: stop" << endl;
if( !handle_error_code(len_rcv, handler.second, len_rcv, "rcv") ) if( !handle_error_code(len_rcv, handler.second, len_rcv, "rcv") )
{ {
@ -290,6 +296,8 @@ void Receive()
break; break;
} }
} }
}
} }
} }
} }