first pass on some new stuff

src/include/switch_types.h

@@ -1233,6 +1233,7 @@ typedef enum {
 	CF_PICKUP,
 	CF_CONFIRM_BLIND_TRANSFER,
 	CF_NO_PRESENCE,
+	CF_CONFERENCE,
 	/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
 	/* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */
 	CF_FLAG_MAX
@@ -1654,6 +1655,10 @@ typedef enum {
 	SWITCH_EVENT_SOCKET_DATA,
 	SWITCH_EVENT_MEDIA_BUG_START,
 	SWITCH_EVENT_MEDIA_BUG_STOP,
+	SWITCH_EVENT_CONFERENCE_DATA_QUERY,
+	SWITCH_EVENT_CONFERENCE_DATA,
+	SWITCH_EVENT_CALL_SETUP_REQ,
+	SWITCH_EVENT_CALL_SETUP_RESULT,
 	SWITCH_EVENT_ALL
 } switch_event_types_t;