[Asterisk-cvs] asterisk/include/asterisk cdr.h, 1.20, 1.21 channel.h, 1.74, 1.75

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv14508/include/asterisk

Modified Files:
	cdr.h channel.h 
Log Message:
Merge anthm's CDR updates (bug #3595)


Index: cdr.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/cdr.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cdr.h	21 Jan 2005 07:06:25 -0000	1.20
+++ cdr.h	23 Feb 2005 22:48:47 -0000	1.21
@@ -19,10 +19,12 @@
 
 #include <asterisk/channel.h>
 #include <sys/time.h>
-
+#define AST_CDR_FLAG_KEEP_VARS		(1 << 0)
 #define AST_CDR_FLAG_POSTED			(1 << 1)
 #define AST_CDR_FLAG_LOCKED			(1 << 2)
 #define AST_CDR_FLAG_CHILD			(1 << 3)
+#define AST_CDR_FLAG_SETVAR			(1 << 4)
+#define AST_CDR_FLAG_RECUR		 	(1 << 5)
 
 #define AST_CDR_NOANSWER			(1 << 0)
 #define AST_CDR_BUSY				(1 << 1)
@@ -37,6 +39,7 @@
 #define AST_MAX_USER_FIELD			256
 
 struct ast_channel;
+AST_LIST_HEAD(varshead,ast_var_t);
 
 /*! Responsible for call detail data */
 struct ast_cdr {
@@ -78,9 +81,19 @@
 	char uniqueid[32];
 	/* User field */
 	char userfield[AST_MAX_USER_FIELD];
+
+	/* A linked list for variables */
+	struct varshead varshead;
+
 	struct ast_cdr *next;
 };
 
+extern void ast_cdr_getvar(struct ast_cdr *cdr, const char *name, char **ret, char *workspace, int workspacelen, int recur);
+extern int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, char *value, int recur);
+extern int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, char delim, char sep, int recur);
+extern void ast_cdr_free_vars(struct ast_cdr *cdr, int recur);
+extern int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr);
+
 typedef int (*ast_cdrbe)(struct ast_cdr *cdr);
 
 /*! Allocate a record */

Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- channel.h	21 Jan 2005 07:06:25 -0000	1.74
+++ channel.h	23 Feb 2005 22:48:47 -0000	1.75
@@ -211,7 +211,7 @@
 	int hangupcause;
 	
 	/* A linked list for variables */
-	AST_LIST_HEAD(varshead,ast_var_t) varshead;
+	struct varshead varshead;
 
 	unsigned int callgroup;
 	unsigned int pickupgroup;