[asterisk-commits] branch mogorman/asterisk-xmpp r9160 - in /team/mogorman/asterisk-xmpp: channe...

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Sun Feb  5 12:31:00 2006
New Revision: 9160

URL: http://svn.digium.com/view/asterisk?rev=9160&view=rev
Log:
little one before cleaning house

Modified:
    team/mogorman/asterisk-xmpp/channels/chan_xmpp.c
    team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h

Modified: team/mogorman/asterisk-xmpp/channels/chan_xmpp.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/channels/chan_xmpp.c?rev=9160&r1=9159&r2=9160&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/channels/chan_xmpp.c (original)
+++ team/mogorman/asterisk-xmpp/channels/chan_xmpp.c Sun Feb  5 12:31:00 2006
@@ -103,19 +103,62 @@
 	.send_html = xmpp_sendhtml,
 };
 
+struct jingle_action {
+	int (*func)(struct axi_master *asterisk, ikspak *pak);
+};
+
 static struct xmpp_pvt {
 	ast_mutex_t lock;			/* Channel private lock */
-	char context[AST_MAX_CONTEXT];		/* Context to call */
-	char exten[AST_MAX_EXTENSION];		/* Extension to call */
-	int reqformat;				/* Requested format */
-	int glaredetect;			/* Detect glare on hangup */
-	int cancelqueue;			/* Cancel queue */
-	int alreadymasqed;			/* Already masqueraded */
-	int launchedpbx;			/* Did we launch the PBX */
-	int nooptimization;			/* Don't leave masq state */
+//	int reqformat;				/* Requested format */
+//	int glaredetect;			/* Detect glare on hangup */
+//	int cancelqueue;			/* Cancel queue */
+//	int alreadymasqed;			/* Already masqueraded */
+//	int launchedpbx;			/* Did we launch the PBX */
+//	int nooptimization;			/* Don't leave masq state */
+	AST_DECLARE_STRING_FIELDS(
+		AST_STRING_FIELD(callid);	/*!< Global CallID */
+		AST_STRING_FIELD(randdata);	/*!< Random data */
+		AST_STRING_FIELD(accountcode);	/*!< Account code */
+		AST_STRING_FIELD(realm);	/*!< Authorization realm */
+		AST_STRING_FIELD(nonce);	/*!< Authorization nonce */
+		AST_STRING_FIELD(opaque);	/*!< Opaque nonsense */
+		AST_STRING_FIELD(qop);		/*!< Quality of Protection, since SIP wasn't complicated enough yet. */
+		AST_STRING_FIELD(domain);	/*!< Authorization domain */
+		AST_STRING_FIELD(refer_to);	/*!< Place to store REFER-TO extension */
+		AST_STRING_FIELD(referred_by);	/*!< Place to store REFERRED-BY extension */
+		AST_STRING_FIELD(refer_contact);/*!< Place to store Contact info from a REFER extension */
+		AST_STRING_FIELD(from);		/*!< The From: header */
+		AST_STRING_FIELD(useragent);	/*!< User agent in SIP request */
+		AST_STRING_FIELD(exten);	/*!< Extension where to start */
+		AST_STRING_FIELD(context);	/*!< Context for this call */
+		AST_STRING_FIELD(subscribecontext); /*!< Subscribecontext */
+		AST_STRING_FIELD(fromdomain);	/*!< Domain to show in the from field */
+		AST_STRING_FIELD(fromuser);	/*!< User to show in the user field */
+		AST_STRING_FIELD(fromname);	/*!< Name to show in the user field */
+		AST_STRING_FIELD(tohost);	/*!< Host we should put in the "to" field */
+		AST_STRING_FIELD(language);	/*!< Default language for this call */
+		AST_STRING_FIELD(musicclass);	/*!< Music on Hold class */
+		AST_STRING_FIELD(rdnis);	/*!< Referring DNIS */
+		AST_STRING_FIELD(theirtag);	/*!< Their tag */
+		AST_STRING_FIELD(username);	/*!< [user] name */
+		AST_STRING_FIELD(peername);	/*!< [peer] name, not set if [user] */
+		AST_STRING_FIELD(authname);	/*!< Who we use for authentication */
+		AST_STRING_FIELD(uri);		/*!< Original requested URI */
+		AST_STRING_FIELD(okcontacturi);	/*!< URI from the 200 OK on INVITE */
+		AST_STRING_FIELD(peersecret);	/*!< Password */
+		AST_STRING_FIELD(peermd5secret);
+		AST_STRING_FIELD(cid_num);	/*!< Caller*ID */
+		AST_STRING_FIELD(cid_name);	/*!< Caller*ID */
+		AST_STRING_FIELD(via);		/*!< Via: header */
+		AST_STRING_FIELD(fullcontact);	/*!< The Contact: that the UA registers with us */
+		AST_STRING_FIELD(our_contact);	/*!< Our contact header */
+		AST_STRING_FIELD(rpid);		/*!< Our RPID header */
+		AST_STRING_FIELD(rpid_from);	/*!< Our RPID From header */
+	);
+	struct axi_candidate *candidates;
 	struct ast_channel *owner;		/* Master Channel */
-	struct ast_channel *chan;		/* Outbound channel */
 	struct xmpp_pvt *next;			/* Next entity */
+
 } *xmpps = NULL;
 
 static int xmpp_queue_frame(struct xmpp_pvt *p, int isoutbound, struct ast_frame *f, struct ast_channel *us)

Modified: team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h?rev=9160&r1=9159&r2=9160&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h (original)
+++ team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h Sun Feb  5 12:31:00 2006
@@ -64,6 +64,7 @@
 	int generation;
 	char ip[13];
 	int port;
+	struct axi_candidate *next;
 };
 
 struct axi_buddy {
@@ -76,7 +77,6 @@
 	enum axi_btype btype;
 	enum axi_prune_register on_roster;
 	int status;
-	struct axi_candidate candidates[3];
 };
 
 struct axi_buddy_container {