[svn-commits] oej: branch group/pinana-publish-1.4 r286379 - in /team/group/pinana-publish-...

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Sep 13 09:42:19 2010
New Revision: 286379

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286379
Log:
Starting some simple configuration work

Added:
    team/group/pinana-publish-1.4/configs/sip-presence.conf   (with props)
Modified:
    team/group/pinana-publish-1.4/channels/chan_sip.c

Modified: team/group/pinana-publish-1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pinana-publish-1.4/channels/chan_sip.c?view=diff&rev=286379&r1=286378&r2=286379
==============================================================================
--- team/group/pinana-publish-1.4/channels/chan_sip.c (original)
+++ team/group/pinana-publish-1.4/channels/chan_sip.c Mon Sep 13 09:42:19 2010
@@ -18956,6 +18956,19 @@
 	return peer;
 }
 
+/*! \brief Load presence configuration
+	
+	This is the file where we configure
+	- which devices to publish to a presence server
+	- which extensions to publish to a presence server
+	- presence servers to use
+ */
+static int presence_load_config(struct ast_config *pcfg)
+{
+	struct ast_variable *v;
+	return TRUE;
+}
+
 /*! \brief Re-read SIP.conf config file
 \note	This function reloads all config data, except for
 	active peers (with registrations). They will only
@@ -18964,7 +18977,7 @@
  */
 static int reload_config(enum channelreloadreason reason)
 {
-	struct ast_config *cfg, *ucfg;
+	struct ast_config *cfg, *ucfg, *pcfg;
 	struct ast_variable *v;
 	struct sip_peer *peer;
 	struct sip_user *user;
@@ -19492,6 +19505,15 @@
 			}
 		}
 	}
+
+	/* Now load the presence configuration */
+	pcfg = ast_config_load("sip-presence.conf");
+	if (pcfg) {
+		int presence_result = presence_load_config(pcfg);
+		ast_config_destroy(ucfg);
+		/* XXX Let's determine later what to do with the result here */
+	}
+
 	if (ast_find_ourip(&__ourip, bindaddr)) {
 		ast_log(LOG_WARNING, "Unable to get own IP address, SIP disabled\n");
 		ast_config_destroy(cfg);

Added: team/group/pinana-publish-1.4/configs/sip-presence.conf
URL: http://svnview.digium.com/svn/asterisk/team/group/pinana-publish-1.4/configs/sip-presence.conf?view=auto&rev=286379
==============================================================================
--- team/group/pinana-publish-1.4/configs/sip-presence.conf (added)
+++ team/group/pinana-publish-1.4/configs/sip-presence.conf Mon Sep 13 09:42:19 2010
@@ -1,0 +1,6 @@
+; Configuration file for SIP presence integration
+; 
+; This is where you configure
+;  - presence servers to use
+;  - which extensions to publish
+;  - which devices to publish

Propchange: team/group/pinana-publish-1.4/configs/sip-presence.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/pinana-publish-1.4/configs/sip-presence.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/group/pinana-publish-1.4/configs/sip-presence.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain