indent

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@417 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/event_handlers/mod_event_test/mod_event_test.c

@@ -33,11 +33,11 @@
 
 static const char modname[] = "mod_event_test";
 
-static void event_handler (switch_event *event)
+static void event_handler(switch_event *event)
 {
 	char buf[1024];
 
-	switch(event->event_id) {
+	switch (event->event_id) {
 	case SWITCH_EVENT_LOG:
 		return;
 		break;
@@ -50,12 +50,12 @@ static void event_handler (switch_event *event)
 
 
 static switch_loadable_module_interface event_test_module_interface = {
-	/*.module_name*/			modname,
-	/*.endpoint_interface*/		NULL,
-	/*.timer_interface*/		NULL,
-	/*.dialplan_interface*/		NULL,
-	/*.codec_interface*/		NULL,
-	/*.application_interface*/	NULL
+	/*.module_name */ modname,
+	/*.endpoint_interface */ NULL,
+	/*.timer_interface */ NULL,
+	/*.dialplan_interface */ NULL,
+	/*.codec_interface */ NULL,
+	/*.application_interface */ NULL
 };
 
 #define MY_EVENT_COOL "test::cool"
@@ -76,9 +76,9 @@ static void *torture_thread(switch_thread *thread, void *obj)
 
 	z = THREADS++;
 
-	while(THREADS > 0) {
+	while (THREADS > 0) {
 		int x;
-		for(x = 0; x < 1; x++) {
+		for (x = 0; x < 1; x++) {
 			if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_COOL) == SWITCH_STATUS_SUCCESS) {
 				switch_event_add_header(event, "event_info", "hello world %d %d", z, y++);
 				switch_event_fire(&event);
@@ -104,7 +104,8 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
 #endif
 
 
-SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename) {
+SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename)
+{
 	/* connect my internal structure to the blank pointer passed to me */
 	*interface = &event_test_module_interface;
 
@@ -112,16 +113,16 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
 		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't register subclass!");
 		return SWITCH_STATUS_GENERR;
 	}
-
 #ifdef TORTURE_ME
-	if (switch_event_bind((char *)modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
+	if (switch_event_bind((char *) modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) !=
+		SWITCH_STATUS_SUCCESS) {
 		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
 		return SWITCH_STATUS_GENERR;
 	}
 
 	if (1) {
 		int x = 0;
-		for(x = 0 ; x < TTHREADS  ; x++) {
+		for (x = 0; x < TTHREADS; x++) {
 			switch_core_launch_thread(torture_thread, NULL);
 		}
 	}
@@ -130,4 +131,3 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
 	/* indicate that the module should continue to be loaded */
 	return SWITCH_STATUS_SUCCESS;
 }
-

src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c

@@ -58,7 +58,7 @@ static struct {
 	struct session session;
 } globals;
 
-static void event_handler (switch_event *event)
+static void event_handler(switch_event *event)
 {
 	char buf[1024];
 	iks *msg;
@@ -76,7 +76,7 @@ static void event_handler (switch_event *event)
 		}
 	}
 
-	switch(event->event_id) {
+	switch (event->event_id) {
 	default:
 		switch_event_serialize(event, buf, sizeof(buf), NULL);
 		//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\nEVENT\n--------------------------------\n%s\n", buf);
@@ -91,8 +91,8 @@ static void event_handler (switch_event *event)
 
 
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
-	 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_target_jid, globals.target_jid)
-	 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_passwd, globals.passwd)
+	SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_target_jid, globals.target_jid)
+	SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_passwd, globals.passwd)
 
 
 	 static switch_status load_config(void)
@@ -103,13 +103,13 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
 	char *cf = "xmpp_event.conf";
 	int count = 0;
 
-	memset(&globals, 0, sizeof(globals));	
+	memset(&globals, 0, sizeof(globals));
 
 	if (!switch_config_open_file(&cfg, cf)) {
 		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
 		return SWITCH_STATUS_TERM;
 	}
-	
+
 	while (switch_config_next_pair(&cfg, &var, &val)) {
 		if (!strcasecmp(cfg.category, "settings")) {
 			if (!strcmp(var, "jid")) {
@@ -131,76 +131,79 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
 
 	if (count == 3) {
 		/* TBD use config to pick what events to bind to */
-		if (switch_event_bind((char *)modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
+		if (switch_event_bind((char *) modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) !=
+			SWITCH_STATUS_SUCCESS) {
 			switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
 			return SWITCH_STATUS_GENERR;
 		}
-	
+
 		status = SWITCH_STATUS_SUCCESS;
 	}
 
 	return status;
-	
+
 }
 
-int on_result (struct session *sess, ikspak *pak)
+int on_result(struct session *sess, ikspak * pak)
 {
 
 	return IKS_FILTER_EAT;
 }
 
-int on_stream (struct session *sess, int type, iks *node)
+int on_stream(struct session *sess, int type, iks * node)
 {
 	sess->counter = opt_timeout;
 
 	switch (type) {
 	case IKS_NODE_START:
-		if (opt_use_tls && !iks_is_secure (sess->parser)) {
-			iks_start_tls (sess->parser);
+		if (opt_use_tls && !iks_is_secure(sess->parser)) {
+			iks_start_tls(sess->parser);
 		}
 		break;
 	case IKS_NODE_NORMAL:
-		if (strcmp ("stream:features", iks_name (node)) == 0) {
-			sess->features = iks_stream_features (node);
-			if (opt_use_tls && !iks_is_secure (sess->parser)) break;
+		if (strcmp("stream:features", iks_name(node)) == 0) {
+			sess->features = iks_stream_features(node);
+			if (opt_use_tls && !iks_is_secure(sess->parser))
+				break;
 			if (sess->authorized) {
 				iks *t;
 				if (sess->features & IKS_STREAM_BIND) {
-					t = iks_make_resource_bind (sess->acc);
-					iks_send (sess->parser, t);
-					iks_delete (t);
+					t = iks_make_resource_bind(sess->acc);
+					iks_send(sess->parser, t);
+					iks_delete(t);
 				}
 				if (sess->features & IKS_STREAM_SESSION) {
-					t = iks_make_session ();
-					iks_insert_attrib (t, "id", "auth");
-					iks_send (sess->parser, t);
-					iks_delete (t);
+					t = iks_make_session();
+					iks_insert_attrib(t, "id", "auth");
+					iks_send(sess->parser, t);
+					iks_delete(t);
 				}
 			} else {
 				if (sess->features & IKS_STREAM_SASL_MD5)
-					iks_start_sasl (sess->parser, IKS_SASL_DIGEST_MD5, sess->acc->user, sess->pass);
+					iks_start_sasl(sess->parser, IKS_SASL_DIGEST_MD5, sess->acc->user, sess->pass);
 				else if (sess->features & IKS_STREAM_SASL_PLAIN)
-					iks_start_sasl (sess->parser, IKS_SASL_PLAIN, sess->acc->user, sess->pass);
+					iks_start_sasl(sess->parser, IKS_SASL_PLAIN, sess->acc->user, sess->pass);
 			}
-		} else if (strcmp ("failure", iks_name (node)) == 0) {
+		} else if (strcmp("failure", iks_name(node)) == 0) {
 			switch_console_printf(SWITCH_CHANNEL_CONSOLE, "sasl authentication failed\n");
-		} else if (strcmp ("success", iks_name (node)) == 0) {
+		} else if (strcmp("success", iks_name(node)) == 0) {
 			switch_console_printf(SWITCH_CHANNEL_CONSOLE, "server connected\n");
 			sess->authorized = 1;
-			iks_send_header (sess->parser, sess->acc->server);
+			iks_send_header(sess->parser, sess->acc->server);
 		} else {
 			ikspak *pak;
 
-			pak = iks_packet (node);
-			iks_filter_packet (my_filter, pak);
-			if (sess->job_done == 1) return IKS_HOOK;
+			pak = iks_packet(node);
+			iks_filter_packet(my_filter, pak);
+			if (sess->job_done == 1)
+				return IKS_HOOK;
 		}
 		break;
 #if 0
 	case IKS_NODE_STOP:
 		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "server disconnected\n");
 		break;
-		
+
 	case IKS_NODE_ERROR:
 		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "stream error\n");
 		break;
@@ -208,13 +211,14 @@ int on_stream (struct session *sess, int type, iks *node)
 
 	}
 
-	if (node) iks_delete (node);
+	if (node)
+		iks_delete(node);
 	return IKS_OK;
 }
 
-int on_msg (void *user_data, ikspak *pak)
+int on_msg(void *user_data, ikspak * pak)
 {
-	char *cmd = iks_find_cdata (pak->x, "body");
+	char *cmd = iks_find_cdata(pak->x, "body");
 	char *arg = NULL;
 	char retbuf[1024] = "";
 	char *p;
@@ -227,67 +231,67 @@ int on_msg (void *user_data, ikspak *pak)
 
 	if ((arg = strchr(cmd, ' '))) {
 		*arg++ = '\0';
-	} 
+	}
 
 	switch_api_execute(cmd, arg, retbuf, sizeof(retbuf));
 
 	return 0;
 }
 
-int on_error (void *user_data, ikspak *pak)
+int on_error(void *user_data, ikspak * pak)
 {
 	switch_console_printf(SWITCH_CHANNEL_CONSOLE, "authorization failed\n");
 	return IKS_FILTER_EAT;
 }
 
-void on_log (struct session *sess, const char *data, size_t size, int is_incoming)
+void on_log(struct session *sess, const char *data, size_t size, int is_incoming)
 {
-	if (iks_is_secure (sess->parser)) fprintf (stderr, "Sec");
-	if (is_incoming) fprintf (stderr, "RECV"); else fprintf (stderr, "SEND");
-	fprintf (stderr, "[%s]\n", data);
+	if (iks_is_secure(sess->parser))
+		fprintf(stderr, "Sec");
+	if (is_incoming)
+		fprintf(stderr, "RECV");
+	else
+		fprintf(stderr, "SEND");
+	fprintf(stderr, "[%s]\n", data);
 }
 
-void j_setup_filter (struct session *sess)
+void j_setup_filter(struct session *sess)
 {
-	if (my_filter) iks_filter_delete (my_filter);
-	my_filter = iks_filter_new ();
-	iks_filter_add_rule (my_filter, on_msg, 0,
-						 IKS_RULE_TYPE, IKS_PAK_MESSAGE,
-						 IKS_RULE_SUBTYPE, IKS_TYPE_CHAT,
-						 IKS_RULE_FROM, globals.target_jid,
-						 IKS_RULE_DONE);
-	iks_filter_add_rule (my_filter, (iksFilterHook *) on_result, sess,
-						 IKS_RULE_TYPE, IKS_PAK_IQ,
-						 IKS_RULE_SUBTYPE, IKS_TYPE_RESULT,
-						 IKS_RULE_ID, "auth",
-						 IKS_RULE_DONE);
-	iks_filter_add_rule (my_filter, on_error, sess,
-						 IKS_RULE_TYPE, IKS_PAK_IQ,
-						 IKS_RULE_SUBTYPE, IKS_TYPE_ERROR,
-						 IKS_RULE_ID, "auth",
-						 IKS_RULE_DONE);
+	if (my_filter)
+		iks_filter_delete(my_filter);
+	my_filter = iks_filter_new();
+	iks_filter_add_rule(my_filter, on_msg, 0,
+						IKS_RULE_TYPE, IKS_PAK_MESSAGE,
+						IKS_RULE_SUBTYPE, IKS_TYPE_CHAT, IKS_RULE_FROM, globals.target_jid, IKS_RULE_DONE);
+	iks_filter_add_rule(my_filter, (iksFilterHook *) on_result, sess,
+						IKS_RULE_TYPE, IKS_PAK_IQ,
+						IKS_RULE_SUBTYPE, IKS_TYPE_RESULT, IKS_RULE_ID, "auth", IKS_RULE_DONE);
+	iks_filter_add_rule(my_filter, on_error, sess,
+						IKS_RULE_TYPE, IKS_PAK_IQ,
+						IKS_RULE_SUBTYPE, IKS_TYPE_ERROR, IKS_RULE_ID, "auth", IKS_RULE_DONE);
 }
 
-static void xmpp_connect (char *jabber_id, char *pass)
+static void xmpp_connect(char *jabber_id, char *pass)
 {
 	while (RUNNING == 1) {
 		int e;
 
-		memset (&globals.session, 0, sizeof (globals.session));
-		globals.session.parser = iks_stream_new (IKS_NS_CLIENT, &globals.session, (iksStreamHook *) on_stream);
-		if (globals.debug) iks_set_log_hook (globals.session.parser, (iksLogHook *) on_log);
-		globals.session.acc = iks_id_new (iks_parser_stack (globals.session.parser), jabber_id);
+		memset(&globals.session, 0, sizeof(globals.session));
+		globals.session.parser = iks_stream_new(IKS_NS_CLIENT, &globals.session, (iksStreamHook *) on_stream);
+		if (globals.debug)
+			iks_set_log_hook(globals.session.parser, (iksLogHook *) on_log);
+		globals.session.acc = iks_id_new(iks_parser_stack(globals.session.parser), jabber_id);
 		if (NULL == globals.session.acc->resource) {
 			/* user gave no resource name, use the default */
 			char tmp[512];
-			sprintf (tmp, "%s@%s/%s", globals.session.acc->user, globals.session.acc->server, modname);
-			globals.session.acc = iks_id_new (iks_parser_stack (globals.session.parser), tmp);
+			sprintf(tmp, "%s@%s/%s", globals.session.acc->user, globals.session.acc->server, modname);
+			globals.session.acc = iks_id_new(iks_parser_stack(globals.session.parser), tmp);
 		}
 		globals.session.pass = pass;
 
-		j_setup_filter (&globals.session);
+		j_setup_filter(&globals.session);
 
-		e = iks_connect_tcp (globals.session.parser, globals.session.acc->server, IKS_JABBER_PORT);
+		e = iks_connect_tcp(globals.session.parser, globals.session.acc->server, IKS_JABBER_PORT);
 		switch (e) {
 		case IKS_OK:
 			break;
@@ -303,13 +307,13 @@ static void xmpp_connect (char *jabber_id, char *pass)
 
 		globals.session.counter = opt_timeout;
 		while (RUNNING == 1) {
-			e = iks_recv (globals.session.parser, 1);
+			e = iks_recv(globals.session.parser, 1);
 
-			if(globals.session.job_done) {
+			if (globals.session.job_done) {
 				break;
 			}
 
-			if (IKS_HOOK == e) { 
+			if (IKS_HOOK == e) {
 				break;
 			}
 
@@ -320,38 +324,39 @@ static void xmpp_connect (char *jabber_id, char *pass)
 			}
 
 			if (!globals.session.authorized) {
-				if (IKS_NET_TLSFAIL == e) { 
+				if (IKS_NET_TLSFAIL == e) {
 					switch_console_printf(SWITCH_CHANNEL_CONSOLE, "tls handshake failed\n");
 					switch_sleep(5000000);
 					break;
 				}
 
-				if (globals.session.counter == 0) { 
+				if (globals.session.counter == 0) {
 					switch_console_printf(SWITCH_CHANNEL_CONSOLE, "network timeout\n");
 					switch_sleep(5000000);
 					break;
 				}
 			}
 		}
-	
+
 		iks_disconnect(globals.session.parser);
-		iks_parser_delete (globals.session.parser);
+		iks_parser_delete(globals.session.parser);
 		globals.session.authorized = 0;
 	}
 	RUNNING = 0;
-	
+
 }
-						  
+
 static switch_loadable_module_interface xmpp_event_module_interface = {
-	/*.module_name*/			modname,
-	/*.endpoint_interface*/		NULL,
-	/*.timer_interface*/		NULL,
-	/*.dialplan_interface*/		NULL,
-	/*.codec_interface*/		NULL,
-	/*.application_interface*/	NULL
+	/*.module_name */ modname,
+	/*.endpoint_interface */ NULL,
+	/*.timer_interface */ NULL,
+	/*.dialplan_interface */ NULL,
+	/*.codec_interface */ NULL,
+	/*.application_interface */ NULL
 };
 
-SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename) {
+SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename)
+{
 	/* connect my internal structure to the blank pointer passed to me */
 	*interface = &xmpp_event_module_interface;