projects
/
ChatPrototype.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57b28c4
)
[IOMultiplexer] fixed SSL accept event handling
author
pk910
<philipp@zoelle1.de>
Thu, 18 Oct 2012 22:57:56 +0000
(
00:57
+0200)
committer
pk910
<philipp@zoelle1.de>
Thu, 18 Oct 2012 22:57:56 +0000
(
00:57
+0200)
src/IOHandler.c
patch
|
blob
|
history
diff --git
a/src/IOHandler.c
b/src/IOHandler.c
index 18e1b7f8e7e1bcbf93aef2b30b9e42637aa615c9..52b27b35b3d8faa1138bc06f28e811394b5d5721 100644
(file)
--- a/
src/IOHandler.c
+++ b/
src/IOHandler.c
@@
-648,14
+648,14
@@
void iohandler_events(struct IODescriptor *iofd, int readable, int writeable) {
iohandler_ssl_connect(iofd);
return;
}
iohandler_ssl_connect(iofd);
return;
}
- if(iofd->ssl && iofd->ssl_server_hs)
- callback_event.type = IOEVENT_CONNECTED;
- else {
+ if(iofd->ssl && iofd->ssl_server_hs) {
callback_event.type = IOEVENT_SSLACCEPT;
callback_event.iofd = iofd->data;
callback_event.data.accept_iofd = iofd;
iofd->data = NULL;
}
callback_event.type = IOEVENT_SSLACCEPT;
callback_event.iofd = iofd->data;
callback_event.data.accept_iofd = iofd;
iofd->data = NULL;
}
+ else
+ callback_event.type = IOEVENT_CONNECTED;
iofd->state = IO_CONNECTED;
engine->update(iofd);
}
iofd->state = IO_CONNECTED;
engine->update(iofd);
}
@@
-810,6
+810,8
@@
char *iohandler_ioeventtype_name(enum IOEventType type) {
return "IOEVENT_CLOSED";
case IOEVENT_ACCEPT:
return "IOEVENT_ACCEPT";
return "IOEVENT_CLOSED";
case IOEVENT_ACCEPT:
return "IOEVENT_ACCEPT";
+ case IOEVENT_SSLACCEPT:
+ return "IOEVENT_SSLACCEPT";
case IOEVENT_TIMEOUT:
return "IOEVENT_TIMEOUT";
default:
case IOEVENT_TIMEOUT:
return "IOEVENT_TIMEOUT";
default: