Hi together,
attched you can find a patch that change behaviour in communication thread
creation. With this patch threads are created only _after_ successful
accept and so eliminate possible DOS (IMHO: it's unwise to popup thread
before check whether this box allowed/denied).
Comments and votes please!
--
Thanks,
AlexIndex: gw/bb_boxc.c
===
RCS file: /home/cvs/gateway/gw/bb_boxc.c,v
retrieving revision 1.81
diff -a -u -p -r1.81 bb_boxc.c
--- gw/bb_boxc.c 11 Aug 2004 16:41:29 - 1.81
+++ gw/bb_boxc.c 20 Jan 2005 12:29:32 -
@@ -61,6 +61,7 @@
* wapbox connections
*
* Kalle Marjola 2000 for project Kannel
+ * Alexander Malysh (various fixes)
*/
#include errno.h
@@ -536,7 +537,7 @@ static Boxc *accept_boxc(int fd, int ssl
newfd = accept(fd, (struct sockaddr *)client_addr, client_addr_len);
if (newfd 0)
- return NULL;
+return NULL;
ip = host_ip(client_addr);
@@ -558,11 +559,7 @@ static Boxc *accept_boxc(int fd, int ssl
return NULL;
#endif
-if (ssl)
-info(0, Client connected from %s using SSL, octstr_get_cstr(ip));
-else
-info(0, Client connected from %s, octstr_get_cstr(ip));
-
+info(0, Client connected from %s %s, octstr_get_cstr(ip), ssl?using SSL:);
/* XXX TODO: do the hand-shake, baby, yeah-yeah! */
@@ -573,7 +570,6 @@ static Boxc *accept_boxc(int fd, int ssl
static void run_smsbox(void *arg)
{
-int fd;
Boxc *newconn;
long sender;
Msg *msg;
@@ -581,12 +577,7 @@ static void run_smsbox(void *arg)
Octstr *key;
list_add_producer(flow_threads);
-fd = (int)arg;
-newconn = accept_boxc(fd, smsbox_port_ssl);
-if (newconn == NULL) {
- list_remove_producer(flow_threads);
- return;
-}
+newconn = arg;
newconn-incoming = list_create();
list_add_producer(newconn-incoming);
newconn-retry = incoming_sms;
@@ -596,9 +587,9 @@ static void run_smsbox(void *arg)
sender = gwthread_create(boxc_sender, newconn);
if (sender == -1) {
- error(0, Failed to start a new thread, disconnecting client %s,
- octstr_get_cstr(newconn-client_ip));
- goto cleanup;
+error(0, Failed to start a new thread, disconnecting client %s,
+ octstr_get_cstr(newconn-client_ip));
+goto cleanup;
}
/*
* We register newconn in the smsbox_list here but mark newconn as routable
@@ -668,18 +659,12 @@ cleanup:
static void run_wapbox(void *arg)
{
-int fd;
Boxc *newconn;
List *newlist;
long sender;
list_add_producer(flow_threads);
-fd = (int)arg;
-newconn = accept_boxc(fd, wapbox_port_ssl);
-if (newconn == NULL) {
- list_remove_producer(flow_threads);
- return;
-}
+newconn = arg;
newconn-is_wap = 1;
/*
@@ -691,8 +676,8 @@ static void run_wapbox(void *arg)
debug(bb, 0, setting up systems for new wapbox);
newlist = list_create();
-list_add_producer(newlist); /* this is released by the
- sender/receiver if it exits */
+/* this is released by the sender/receiver if it exits */
+list_add_producer(newlist);
newconn-incoming = newlist;
newconn-retry = incoming_wdp;
@@ -887,7 +872,7 @@ static void wdp_to_wapboxes(void *arg)
static void wait_for_connections(int fd, void (*function) (void *arg),
- List *waited)
+ List *waited, int ssl)
{
int ret;
int timeout = 10; /* 10 sec. */
@@ -896,32 +881,34 @@ static void wait_for_connections(int fd,
while(bb_status != BB_DEAD) {
- /* if we are being shutdowned, as long as there is
- * messages in incoming list allow new connections, but when
- * list is empty, exit.
+/* if we are being shutdowned, as long as there is
+ * messages in incoming list allow new connections, but when
+ * list is empty, exit.
* Note: We have timeout (defined above) for which we allow new connections.
* Otherwise we wait here for ever!
- */
- if (bb_status == BB_SHUTDOWN) {
- ret = list_wait_until_nonempty(waited);
- if (ret == -1 || !timeout)
-break;
-else
-timeout--;
- }
+ */
+if (bb_status == BB_SHUTDOWN) {
+ret = list_wait_until_nonempty(waited);
+if (ret == -1 || !timeout)
+break;
+else
+timeout--;
+}
-/* block here if suspended */
-list_consume(suspended);
+/* block here if suspended */
+list_consume(suspended);
-ret = gwthread_pollfd(fd, POLLIN, 1.0);
- if (ret 0) {
- gwthread_create(function, (void *)fd);
- gwthread_sleep(1.0);
- } else if (ret 0) {
- if(errno==EINTR) continue;
- if(errno==EAGAIN) continue;
-
