X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=190df8a14ebf9613399bea5e55f0ae65f741645a;hp=99482d9d17f36ab0cfdd1e86e29ca1a641e6cf28;hb=926c584394c29354752458b06f7226f0da0dd35e;hpb=9163a0f2c295ef0b16ed09c46dffaec75478bb6a diff --git a/server.c b/server.c index 99482d9d..190df8a1 100644 --- a/server.c +++ b/server.c @@ -110,32 +110,6 @@ struct server_args_info conf; /** the file containing user information (public key, permissions) */ char *user_list_file = NULL; -extern void dccp_send_init(struct sender *); -extern void http_send_init(struct sender *); -extern void ortp_send_init(struct sender *); - -/** the list of supported senders */ -struct sender senders[] = { - { - .name = "http", - .init = http_send_init, - }, - { - .name = "dccp", - .init = dccp_send_init, - }, -#ifdef HAVE_ORTP - { - .name = "ortp", - .init = ortp_send_init, - }, -#endif - { - .name = NULL, - } -}; - - /* global variables for server-internal use */ static FILE *logfile; static int mmd_mutex, mmd_shm_id; @@ -202,7 +176,6 @@ static void shm_init(void) mmd->active_connections = 0; mmd->vss_status_flags = VSS_NEXT; mmd->new_vss_status_flags = VSS_NEXT; - mmd->sender_cmd_data.cmd_num = -1; return; err_out: PARA_EMERG_LOG("%s\n", para_strerror(-ret)); @@ -523,14 +496,6 @@ genocide: exit(EXIT_FAILURE); } } - if (mmd->sender_cmd_data.cmd_num >= 0) { - int num = mmd->sender_cmd_data.cmd_num, - s = mmd->sender_cmd_data.sender_num; - - if (senders[s].client_cmds[num]) - senders[s].client_cmds[num](&mmd->sender_cmd_data); - mmd->sender_cmd_data.cmd_num = -1; - } if (!FD_ISSET(sockfd, &rfds)) goto repeat;