5 files changed, 29 insertions, 9 deletions
diff --git a/configs/cel.conf.sample b/configs/cel.conf.sample
index d9ba90cb5..a17cf6881 100644
--- a/configs/cel.conf.sample
+++ b/configs/cel.conf.sample
@@ -56,13 +56,17 @@ apps=dial,park
 ;  PARK_END         -- Unpark event
 ;  BRIDGE_START     -- The time a bridge is started
 ;  BRIDGE_END       -- The time a bridge is ended
-;  3WAY_START       -- When a 3-way conference starts (usually via attended xfer)
+;  BRIDGE_UPDATE    -- This is a replacement channel (Masquerade)
+;  3WAY_START       -- When a 3-way conference starts (usually via attended transfer)
 ;  3WAY_END         -- When one or all exit a 3-way conference
 ;  BLINDTRANSFER    -- When a blind transfer is initiated
 ;  ATTENDEDTRANSFER -- When an attended transfer is initiated
 ;  TRANSFER         -- Generic transfer initiated; not used yet...?
+;  PICKUP           -- This channel picked up the peer channel
+;  FORWARD          -- This channel is being forwarded somewhere else
 ;  HOOKFLASH        -- So far, when a hookflash event occurs on a DAHDI
 ;                      interface
+;  LINKEDID_END     -- The last channel with the given linkedid is retired
 ;  USER_DEFINED     -- Triggered from the dialplan, and has a name given by the
 ;                      user
 ;
diff --git a/configs/cel_custom.conf.sample b/configs/cel_custom.conf.sample
index 37491a48b..59c33dc54 100644
--- a/configs/cel_custom.conf.sample
+++ b/configs/cel_custom.conf.sample
@@ -22,10 +22,13 @@
 ; details from the CEL event.  There are also a few variables created by this
 ; module that can be used in a mapping:
 ;
-;    eventtype  - The name of the CEL event.
-;    eventtime  - The timestamp of the CEL event.
-;    eventextra - Extra data included with this CEL event, typically along with
-;                 an event of type USER_DEFINED from CELGenUserEvent().
+;    eventtype   - The name of the CEL event.
+;    eventtime   - The timestamp of the CEL event.
+;    userdeftype - User defined event type name from CELGenUserEvent().
+;    eventextra  - Extra data included with this CEL event, typically along with
+;                  an event of type USER_DEFINED from CELGenUserEvent().
+;    BRIDGEPEER  - Bridged peer channel name at the time of the CEL event.
+;                  CHANNEL(peer) could also be used.
 ;
 [mappings]
-;Master.csv => ${CSV_QUOTE(${eventtype})},${CSV_QUOTE(${eventtime})},${CSV_QUOTE(${CALLERID(name)})},${CSV_QUOTE(${CALLERID(num)})},${CSV_QUOTE(${CALLERID(ANI)})},${CSV_QUOTE(${CALLERID(RDNIS)})},${CSV_QUOTE(${CALLERID(DNID)})},${CSV_QUOTE(${CHANNEL(exten)})},${CSV_QUOTE(${CHANNEL(context)})},${CSV_QUOTE(${CHANNEL(channame)})},${CSV_QUOTE(${CHANNEL(appname)})},${CSV_QUOTE(${CHANNEL(appdata)})},${CSV_QUOTE(${CHANNEL(amaflags)})},${CSV_QUOTE(${CHANNEL(accountcode)})},${CSV_QUOTE(${CHANNEL(uniqueid)})},${CSV_QUOTE(${CHANNEL(linkedid)})},${CSV_QUOTE(${CHANNEL(peer)})},${CSV_QUOTE(${CHANNEL(userfield)})},${CSV_QUOTE(${eventextra})}
+;Master.csv => ${CSV_QUOTE(${eventtype})},${CSV_QUOTE(${eventtime})},${CSV_QUOTE(${CALLERID(name)})},${CSV_QUOTE(${CALLERID(num)})},${CSV_QUOTE(${CALLERID(ANI)})},${CSV_QUOTE(${CALLERID(RDNIS)})},${CSV_QUOTE(${CALLERID(DNID)})},${CSV_QUOTE(${CHANNEL(exten)})},${CSV_QUOTE(${CHANNEL(context)})},${CSV_QUOTE(${CHANNEL(channame)})},${CSV_QUOTE(${CHANNEL(appname)})},${CSV_QUOTE(${CHANNEL(appdata)})},${CSV_QUOTE(${CHANNEL(amaflags)})},${CSV_QUOTE(${CHANNEL(accountcode)})},${CSV_QUOTE(${CHANNEL(uniqueid)})},${CSV_QUOTE(${CHANNEL(linkedid)})},${CSV_QUOTE(${BRIDGEPEER})},${CSV_QUOTE(${CHANNEL(userfield)})},${CSV_QUOTE(${userdeftype})},${CSV_QUOTE(${eventextra})}
diff --git a/configs/cel_odbc.conf.sample b/configs/cel_odbc.conf.sample
index 5f21326df..68d3b0adb 100644
--- a/configs/cel_odbc.conf.sample
+++ b/configs/cel_odbc.conf.sample
@@ -64,6 +64,7 @@
 ;	amaflags  (an int)
 ;	userfield
 ;	peer
+;	extra
 
 ; The point of this module is to allow you log whatever you like in terms of the
 ; CEL variables.  Do you want to log uniqueid?  Then simply ensure that your
diff --git a/configs/cel_pgsql.conf.sample b/configs/cel_pgsql.conf.sample
index 67d0574ab..790757162 100644
--- a/configs/cel_pgsql.conf.sample
+++ b/configs/cel_pgsql.conf.sample
@@ -48,7 +48,7 @@
 ;	peeraccount
 ;	uniqueid
 ;	linkedid
-;	amaflag  (an int)
+;	amaflags  (an int)
 ;	userfield
 ;	peer
 ;	extra
diff --git a/configs/cel_sqlite3_custom.conf.sample b/configs/cel_sqlite3_custom.conf.sample
index b1486bd5c..14f2dd228 100644
--- a/configs/cel_sqlite3_custom.conf.sample
+++ b/configs/cel_sqlite3_custom.conf.sample
@@ -5,7 +5,19 @@
 ;
 ; Mappings for sqlite3 config file
 ;
+; Within a mapping, use the CALLERID() and CHANNEL() functions to retrieve
+; details from the CEL event.  There are also a few variables created by this
+; module that can be used in a mapping:
+;
+;    eventtype   - The name of the CEL event.
+;    eventtime   - The timestamp of the CEL event.
+;    userdeftype - User defined event type name from CELGenUserEvent().
+;    eventextra  - Extra data included with this CEL event, typically along with
+;                  an event of type USER_DEFINED from CELGenUserEvent().
+;    BRIDGEPEER  - Bridged peer channel name at the time of the CEL event.
+;                  CHANNEL(peer) could also be used.
+;
 ;[master] ; currently, only file "master.db" is supported, with only one table at a time.
 ;table	=> cel
-;columns	=> eventtype, eventtime, cidname, cidnum, cidani, cidrdnis, ciddnid, context, exten, channame, appname, appdata, amaflags, accountcode, uniqueid, userfield, peer
-;values	=> '${eventtype}','${eventtime}','${CALLERID(name)}','${CALLERID(num)}','${CALLERID(ANI)}','${CALLERID(RDNIS)}','${CALLERID(DNID)}','${CHANNEL(context)}','${CHANNEL(exten)}','${CHANNEL(channame)}','${CHANNEL(appname)}','${CHANNEL(appdata)}','${CHANNEL(amaflags)}','${CHANNEL(accountcode)}','${CHANNEL(uniqueid)}','${CHANNEL(userfield)}','${CHANNEL(peer)}'
+;columns	=> eventtype, eventtime, cidname, cidnum, cidani, cidrdnis, ciddnid, context, exten, channame, appname, appdata, amaflags, accountcode, uniqueid, userfield, peer, userdeftype, eventextra
+;values	=> '${eventtype}','${eventtime}','${CALLERID(name)}','${CALLERID(num)}','${CALLERID(ANI)}','${CALLERID(RDNIS)}','${CALLERID(DNID)}','${CHANNEL(context)}','${CHANNEL(exten)}','${CHANNEL(channame)}','${CHANNEL(appname)}','${CHANNEL(appdata)}','${CHANNEL(amaflags)}','${CHANNEL(accountcode)}','${CHANNEL(uniqueid)}','${CHANNEL(userfield)}','${BRIDGEPEER}','${userdeftype}','${eventextra}'