[asterisk-commits] dvossel: branch dvossel/gtalk_fixup r291190 - /team/dvossel/gtalk_fixup/chann...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Oct 11 15:18:52 2010
New Revision: 291190

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=291190
Log:
add todo notes

Modified:
    team/dvossel/gtalk_fixup/channels/chan_gtalk.c

Modified: team/dvossel/gtalk_fixup/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/gtalk_fixup/channels/chan_gtalk.c?view=diff&rev=291190&r1=291189&r2=291190
==============================================================================
--- team/dvossel/gtalk_fixup/channels/chan_gtalk.c (original)
+++ team/dvossel/gtalk_fixup/channels/chan_gtalk.c Mon Oct 11 15:18:52 2010
@@ -25,6 +25,10 @@
  * \brief Gtalk Channel Driver, until google/libjingle works with jingle spec
  *
  * \ingroup channel_drivers
+ *
+ * ********** General TODO:s
+ * \todo Support config reloading.
+ * \todo Fix native bridging.
  */
 
 /*** MODULEINFO
@@ -32,6 +36,7 @@
 	<depend>res_jabber</depend>
 	<use>openssl</use>
  ***/
+
 
 #include "asterisk.h"
 
@@ -193,7 +198,7 @@
 static int gtalk_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
 static int gtalk_sendhtml(struct ast_channel *ast, int subclass, const char *data, int datalen);
 static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const char *them, const char *sid);
-static char *gtalk_do_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+/* static char *gtalk_do_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); */
 static char *gtalk_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 static int gtalk_update_externip(void);
 
@@ -229,7 +234,7 @@
 static struct in_addr __ourip;
 
 static struct ast_cli_entry gtalk_cli[] = {
-	AST_CLI_DEFINE(gtalk_do_reload, "Reload GoogleTalk configuration"),
+/*	AST_CLI_DEFINE(gtalk_do_reload, "Reload GoogleTalk configuration"), XXX TODO reloads are not possible yet. */
 	AST_CLI_DEFINE(gtalk_show_channels, "Show GoogleTalk channels"),
 };
 
@@ -862,12 +867,11 @@
 	ours1->generation = 0;
 	p->ourcandidates = ours1;
 
-	/* XXX TODO this is a blocking action.  We send a STUN request to the server
+	/* XXX this is a blocking action.  We send a STUN request to the server
 	 * and wait for the response.  If blocking here is a problem the STUN requests/responses
 	 * for the externip may need to be done differently. */
 	gtalk_update_externip();
 	if (!ast_strlen_zero(externip)) {
-		/* XXX We should really stun for this one not just go with externip XXX */
 		ast_copy_string(ours2->username, user, sizeof(ours2->username));
 		ast_copy_string(ours2->password, pass, sizeof(ours2->password));
 		ast_copy_string(ours2->ip, externip, sizeof(ours2->ip));
@@ -1919,7 +1923,9 @@
 #undef FORMAT
 }
 
-/*! \brief CLI command "gtalk reload" */
+/*! \brief CLI command "gtalk reload"
+ *  \todo XXX TODO make this work. */
+#if 0
 static char *gtalk_do_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	switch (cmd) {
@@ -1933,10 +1939,10 @@
 		return NULL;
 	}
 
-	/* XXX TODO it doesn't work, why would you lie to us like this. */
 	ast_verbose("IT DOES WORK!\n");
 	return CLI_SUCCESS;
 }
+#endif
 
 static int gtalk_parser(void *data, ikspak *pak)
 {
@@ -2274,12 +2280,14 @@
 	return 0;
 }
 
-/*! \brief Reload module */
+/*! \brief Reload module
+ *  \todo XXX TODO make this work. */
+#if 0
 static int reload(void)
 {
 	return 0;
 }
-
+#endif
 /*! \brief Unload the gtalk channel from Asterisk */
 static int unload_module(void)
 {
@@ -2315,6 +2323,6 @@
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Gtalk Channel Driver",
 		.load = load_module,
 		.unload = unload_module,
-		.reload = reload,
+		/* .reload = reload, */
 		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );