Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.141
diff -u -r1.141 Makefile
--- Makefile	12 Mar 2005 05:37:32 -0000	1.141
+++ Makefile	19 Mar 2005 17:54:23 -0000
@@ -225,6 +225,11 @@
 LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L/usr/local/ssl/lib
 endif
 LIBS+=-lssl
+
+# To enable UUID/GUID support in CDRs, uncomment
+#LIBS+=-luuid
+#OPTIONS+=-DCDR_GUID
+
 OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	translate.o file.o say.o pbx.o cli.o md5.o term.o \
 	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.31
diff -u -r1.31 cdr.c
--- cdr.c	23 Feb 2005 22:48:47 -0000	1.31
+++ cdr.c	19 Mar 2005 17:54:24 -0000
@@ -26,6 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef CDR_GUID
+#include <uuid/uuid.h>
+#endif
+
 int ast_default_amaflags = AST_CDR_DOCUMENTATION;
 char ast_default_accountcode[20] = "";
 
@@ -575,6 +579,9 @@
 			strncpy(cdr->dcontext, c->context, sizeof(cdr->dcontext) - 1);
 			/* Unique call identifier */
 			strncpy(cdr->uniqueid, c->uniqueid, sizeof(cdr->uniqueid) - 1);
+#ifdef CDR_GUID
+            uuid_generate_time(cdr->guid);
+#endif
 		}
 		cdr = cdr->next;
 	}
Index: include/asterisk/cdr.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/cdr.h,v
retrieving revision 1.21
diff -u -r1.21 cdr.h
--- include/asterisk/cdr.h	23 Feb 2005 22:48:47 -0000	1.21
+++ include/asterisk/cdr.h	19 Mar 2005 17:54:25 -0000
@@ -19,6 +19,11 @@
 
 #include <asterisk/channel.h>
 #include <sys/time.h>
+
+#ifdef CDR_GUID
+#include <uuid/uuid.h>
+#endif
+
 #define AST_CDR_FLAG_KEEP_VARS		(1 << 0)
 #define AST_CDR_FLAG_POSTED			(1 << 1)
 #define AST_CDR_FLAG_LOCKED			(1 << 2)
@@ -79,6 +84,10 @@
 	unsigned int flags;				
 	/* Unique Channel Identifier */
 	char uniqueid[32];
+#ifdef CDR_GUID
+    /* GUID */
+    uuid_t guid;
+#endif
 	/* User field */
 	char userfield[AST_MAX_USER_FIELD];