[asterisk-commits] bebuild: tag 12.3.0-rc2 r414784 - in /tags/12.3.0-rc2: ./ contrib/ast-db-mana...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed May 28 16:08:45 CDT 2014


Author: bebuild
Date: Wed May 28 16:08:42 2014
New Revision: 414784

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414784
Log:
Merge r414528, r414749, r414763, r414765 for 12.3.0-rc2

Modified:
    tags/12.3.0-rc2/   (props changed)
    tags/12.3.0-rc2/ChangeLog
    tags/12.3.0-rc2/UPGRADE.txt
    tags/12.3.0-rc2/contrib/ast-db-manage/cdr/env.py
    tags/12.3.0-rc2/include/asterisk/manager.h
    tags/12.3.0-rc2/include/asterisk/res_pjsip_session.h
    tags/12.3.0-rc2/res/res_pjsip_session.c
    tags/12.3.0-rc2/res/res_pjsip_t38.c
    tags/12.3.0-rc2/rest-api/api-docs/applications.json
    tags/12.3.0-rc2/rest-api/api-docs/asterisk.json
    tags/12.3.0-rc2/rest-api/api-docs/bridges.json
    tags/12.3.0-rc2/rest-api/api-docs/channels.json
    tags/12.3.0-rc2/rest-api/api-docs/deviceStates.json
    tags/12.3.0-rc2/rest-api/api-docs/endpoints.json
    tags/12.3.0-rc2/rest-api/api-docs/events.json
    tags/12.3.0-rc2/rest-api/api-docs/mailboxes.json
    tags/12.3.0-rc2/rest-api/api-docs/playbacks.json
    tags/12.3.0-rc2/rest-api/api-docs/recordings.json
    tags/12.3.0-rc2/rest-api/api-docs/sounds.json
    tags/12.3.0-rc2/rest-api/resources.json
    tags/12.3.0-rc2/tests/test_cel.c

Propchange: tags/12.3.0-rc2/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/12:414528,414749,414763,414765

Modified: tags/12.3.0-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/ChangeLog?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/ChangeLog (original)
+++ tags/12.3.0-rc2/ChangeLog Wed May 28 16:08:42 2014
@@ -1,3 +1,53 @@
+2014-05-28  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 12.3.0-rc2 Released.
+
+	* test_cel: Fix unit tests broken due to event def changes from
+	  res_corosync
+
+	  This patch instructs test_cel to skip any IE types it doesn't
+	  care about. The addition of the raw and bitfield types caused
+	  the tests to fail.
+
+
+	* res_pjsip_session: Fix leaked video RTP ports.
+
+	  Simply enabling PJSIP to negotiage a video codec (e.g., h264)
+	  would leak video RTP ports if the codec were not negotiated by
+	  an incoming call.
+
+	  - Made add_sdp_streams() associate the handler with the media
+	    stream if the handler handled the media stream.  Otherwise,
+	    when the ast_sip_session_media object was destroyed it didn't
+	    know how to clean up the RTP resources.
+
+	  - Fixed sdp_requires_deferral() associating the handler with the
+	    media stream when deciding if the SDP processing needs to be
+	    deferred for T.38. Like the leaked video RTP ports, the T.38
+	    handler needs to clean up allocated resources from deciding if
+	    SDP processing needs to be deffered.
+
+	  - Cleaned up some dead code in handle_incoming_sdp() and
+	    sdp_requires_deferral().
+
+	  ASTERISK-23721 #close
+	  Reported by: cervajs
+
+	* ast-db-manage/cdr/env.py: Don't fail if a config file can't be
+	  loaded
+
+	  When generating SQL files via the repotools alembic_creator.py
+	  script, a configuration object is used programatically with
+	  SQLAlechemy, as opposed to a configuration file. This patch
+	  ignores failures to interpret a config file, as ... there isn't
+	  one in this case.
+
+	* AMI/ARI: Update version numbers
+
+	  Update the semantic versioning of ARI to 1.3.0 and AMI to 2.3.0
+	  to account for backwards compatible changes going from 12.2.0
+	  to 12.3.0.
+
 2014-05-22  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 12.3.0-rc1 Released.

Modified: tags/12.3.0-rc2/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/UPGRADE.txt?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/UPGRADE.txt (original)
+++ tags/12.3.0-rc2/UPGRADE.txt Wed May 28 16:08:42 2014
@@ -24,6 +24,14 @@
 
  - The asterisk command line -I option and the asterisk.conf internal_timing
    option are removed and always enabled if any timing module is loaded.
+
+AMI:
+ - The AMI version has been changed from 2.2.0 to 2.3.0. This is to reflect
+   the backwards compatible changes listed in the CHANGES file.
+
+ARI:
+ - The ARI version has been changed from 1.2.0 to 1.3.0. This is to reflect
+   the backwards compatible changes listed in the CHANGES file.
 
 Build Options:
  - Added a new Compiler Flag, REF_DEBUG. When enabled, reference counted

Modified: tags/12.3.0-rc2/contrib/ast-db-manage/cdr/env.py
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/contrib/ast-db-manage/cdr/env.py?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/contrib/ast-db-manage/cdr/env.py (original)
+++ tags/12.3.0-rc2/contrib/ast-db-manage/cdr/env.py Wed May 28 16:08:42 2014
@@ -9,7 +9,10 @@
 
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
-fileConfig(config.config_file_name)
+try:
+    fileConfig(config.config_file_name)
+except:
+    pass
 
 # add your model's MetaData object here
 # for 'autogenerate' support

Modified: tags/12.3.0-rc2/include/asterisk/manager.h
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/include/asterisk/manager.h?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/include/asterisk/manager.h (original)
+++ tags/12.3.0-rc2/include/asterisk/manager.h Wed May 28 16:08:42 2014
@@ -54,7 +54,7 @@
 - \ref manager.c Main manager code file
  */
 
-#define AMI_VERSION                     "2.2.0"
+#define AMI_VERSION                     "2.3.0"
 #define DEFAULT_MANAGER_PORT 5038	/* Default port for Asterisk management via TCP */
 #define DEFAULT_MANAGER_TLS_PORT 5039	/* Default port for Asterisk management via TCP */
 

Modified: tags/12.3.0-rc2/include/asterisk/res_pjsip_session.h
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/include/asterisk/res_pjsip_session.h?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/include/asterisk/res_pjsip_session.h (original)
+++ tags/12.3.0-rc2/include/asterisk/res_pjsip_session.h Wed May 28 16:08:42 2014
@@ -216,6 +216,17 @@
 	AST_LIST_ENTRY(ast_sip_session_supplement) next;
 };
 
+enum ast_sip_session_sdp_stream_defer {
+	/*! The stream was not handled by this handler. If there are other registered handlers for this stream type, they will be called. */
+	AST_SIP_SESSION_SDP_DEFER_NOT_HANDLED,
+	/*! There was an error encountered. No further operations will take place and the current negotiation will be abandoned. */
+	AST_SIP_SESSION_SDP_DEFER_ERROR,
+	/*! Re-invite is not needed */
+	AST_SIP_SESSION_SDP_DEFER_NOT_NEEDED,
+	/*! Re-invite should be deferred and will be resumed later. No further operations will take place. */
+	AST_SIP_SESSION_SDP_DEFER_NEEDED,
+};
+
 /*!
  * \brief A handler for SDPs in SIP sessions
  *
@@ -230,14 +241,17 @@
 	 * If a stream can not be immediately negotiated the re-invite can be deferred and
 	 * resumed at a later time. It is up to the handler which caused deferral to occur
 	 * to resume it.
+	 *
 	 * \param session The session for which the media is being re-invited
 	 * \param session_media The media being reinvited
-	 * \param sdp The entire SDP.
-	 * \retval 0 The stream was unhandled or does not need the re-invite to be deferred.
-	 * \retval 1 Re-invite should be deferred and will be resumed later. No further operations will take place.
+	 * \param sdp The entire SDP. Useful for getting "global" information, such as connections or attributes
+	 * \param stream PJSIP incoming SDP media lines to parse by handler.
+	 *
+	 * \return enum ast_sip_session_defer_stream
+	 *
 	 * \note This is optional, if not implemented the stream is assumed to not be deferred.
 	 */
-	int (*defer_incoming_sdp_stream)(struct ast_sip_session *session, struct ast_sip_session_media *session_media, const struct pjmedia_sdp_session *sdp, const struct pjmedia_sdp_media *stream);
+	enum ast_sip_session_sdp_stream_defer (*defer_incoming_sdp_stream)(struct ast_sip_session *session, struct ast_sip_session_media *session_media, const struct pjmedia_sdp_session *sdp, const struct pjmedia_sdp_media *stream);
 	/*!
 	 * \brief Set session details based on a stream in an incoming SDP offer or answer
 	 * \param session The session for which the media is being negotiated

Modified: tags/12.3.0-rc2/res/res_pjsip_session.c
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/res/res_pjsip_session.c?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/res/res_pjsip_session.c (original)
+++ tags/12.3.0-rc2/res/res_pjsip_session.c Wed May 28 16:08:42 2014
@@ -337,6 +337,7 @@
 static int handle_incoming_sdp(struct ast_sip_session *session, const pjmedia_sdp_session *sdp)
 {
 	int i;
+
 	if (validate_incoming_sdp(sdp)) {
 		return -1;
 	}
@@ -347,6 +348,7 @@
 		struct ast_sip_session_sdp_handler *handler;
 		RAII_VAR(struct sdp_handler_list *, handler_list, NULL, ao2_cleanup);
 		RAII_VAR(struct ast_sip_session_media *, session_media, NULL, ao2_cleanup);
+		int res;
 
 		/* We need a null-terminated version of the media string */
 		ast_copy_pj_str(media, &sdp->media[i]->desc.media, sizeof(media));
@@ -359,18 +361,15 @@
 		}
 
 		if (session_media->handler) {
-			int res;
 			handler = session_media->handler;
-			res = handler->negotiate_incoming_sdp_stream(
-				session, session_media, sdp, sdp->media[i]);
+			res = handler->negotiate_incoming_sdp_stream(session, session_media, sdp,
+				sdp->media[i]);
 			if (res <= 0) {
 				/* Catastrophic failure or ignored by assigned handler. Abort! */
 				return -1;
 			}
-			if (res > 0) {
-				/* Handled by this handler. Move to the next stream */
-				continue;
-			}
+			/* Handled by this handler. Move to the next stream */
+			continue;
 		}
 
 		handler_list = ao2_find(sdp_handlers, media, OBJ_KEY);
@@ -379,13 +378,8 @@
 			continue;
 		}
 		AST_LIST_TRAVERSE(&handler_list->list, handler, next) {
-			int res;
-			if (session_media->handler) {
-				/* There is only one slot for this stream type and it has already been claimed
-				 * so it will go unhandled */
-				break;
-			}
-			res = handler->negotiate_incoming_sdp_stream(session, session_media, sdp, sdp->media[i]);
+			res = handler->negotiate_incoming_sdp_stream(session, session_media, sdp,
+				sdp->media[i]);
 			if (res < 0) {
 				/* Catastrophic failure. Abort! */
 				return -1;
@@ -420,6 +414,7 @@
 		char media[20];
 		struct ast_sip_session_sdp_handler *handler;
 		RAII_VAR(struct sdp_handler_list *, handler_list, NULL, ao2_cleanup);
+		int res;
 
 		if (!remote->media[i]) {
 			continue;
@@ -435,7 +430,8 @@
 
 		handler = session_media->handler;
 		if (handler) {
-			int res = handler->apply_negotiated_sdp_stream(session, session_media, local, local->media[i], remote, remote->media[i]);
+			res = handler->apply_negotiated_sdp_stream(session, session_media, local,
+				local->media[i], remote, remote->media[i]);
 			if (res >= 0) {
 				return CMP_MATCH;
 			}
@@ -448,7 +444,8 @@
 			continue;
 		}
 		AST_LIST_TRAVERSE(&handler_list->list, handler, next) {
-			int res = handler->apply_negotiated_sdp_stream(session, session_media, local, local->media[i], remote, remote->media[i]);
+			res = handler->apply_negotiated_sdp_stream(session, session_media, local,
+				local->media[i], remote, remote->media[i]);
 			if (res < 0) {
 				/* Catastrophic failure. Abort! */
 				return 0;
@@ -807,6 +804,7 @@
 static int sdp_requires_deferral(struct ast_sip_session *session, const pjmedia_sdp_session *sdp)
 {
 	int i;
+
 	if (validate_incoming_sdp(sdp)) {
 		return 0;
 	}
@@ -817,6 +815,7 @@
 		struct ast_sip_session_sdp_handler *handler;
 		RAII_VAR(struct sdp_handler_list *, handler_list, NULL, ao2_cleanup);
 		RAII_VAR(struct ast_sip_session_media *, session_media, NULL, ao2_cleanup);
+		enum ast_sip_session_sdp_stream_defer res;
 
 		/* We need a null-terminated version of the media string */
 		ast_copy_pj_str(media, &sdp->media[i]->desc.media, sizeof(media));
@@ -828,14 +827,24 @@
 			continue;
 		}
 
-		if (session_media->handler && session_media->handler->defer_incoming_sdp_stream) {
-			int res;
+		if (session_media->handler) {
 			handler = session_media->handler;
-			res = handler->defer_incoming_sdp_stream(
-				session, session_media, sdp, sdp->media[i]);
-			if (res) {
-				return 1;
+			if (handler->defer_incoming_sdp_stream) {
+				res = handler->defer_incoming_sdp_stream(session, session_media, sdp,
+					sdp->media[i]);
+				switch (res) {
+				case AST_SIP_SESSION_SDP_DEFER_NOT_HANDLED:
+					break;
+				case AST_SIP_SESSION_SDP_DEFER_ERROR:
+					return 0;
+				case AST_SIP_SESSION_SDP_DEFER_NOT_NEEDED:
+					break;
+				case AST_SIP_SESSION_SDP_DEFER_NEEDED:
+					return 1;
+				}
 			}
+			/* Handled by this handler. Move to the next stream */
+			continue;
 		}
 
 		handler_list = ao2_find(sdp_handlers, media, OBJ_KEY);
@@ -844,19 +853,28 @@
 			continue;
 		}
 		AST_LIST_TRAVERSE(&handler_list->list, handler, next) {
-			int res;
-			if (session_media->handler) {
-				/* There is only one slot for this stream type and it has already been claimed
-				 * so it will go unhandled */
-				break;
-			}
 			if (!handler->defer_incoming_sdp_stream) {
 				continue;
 			}
-			res = handler->defer_incoming_sdp_stream(session, session_media, sdp, sdp->media[i]);
-			if (res) {
+			res = handler->defer_incoming_sdp_stream(session, session_media, sdp,
+				sdp->media[i]);
+			switch (res) {
+			case AST_SIP_SESSION_SDP_DEFER_NOT_HANDLED:
+				continue;
+			case AST_SIP_SESSION_SDP_DEFER_ERROR:
+				session_media->handler = handler;
+				return 0;
+			case AST_SIP_SESSION_SDP_DEFER_NOT_NEEDED:
+				/* Handled by this handler. */
+				session_media->handler = handler;
+				break;
+			case AST_SIP_SESSION_SDP_DEFER_NEEDED:
+				/* Handled by this handler. */
+				session_media->handler = handler;
 				return 1;
 			}
+			/* Move to the next stream */
+			break;
 		}
 	}
 	return 0;
@@ -2003,10 +2021,12 @@
 	struct ast_sip_session *session = data;
 	struct ast_sip_session_sdp_handler *handler = session_media->handler;
 	RAII_VAR(struct sdp_handler_list *, handler_list, NULL, ao2_cleanup);
+	int res;
 
 	if (handler) {
 		/* if an already assigned handler does not handle the session_media or reports a catastrophic error, fail */
-		if (handler->create_outgoing_sdp_stream(session, session_media, answer) <= 0) {
+		res = handler->create_outgoing_sdp_stream(session, session_media, answer);
+		if (res <= 0) {
 			return 0;
 		}
 		return CMP_MATCH;
@@ -2019,13 +2039,14 @@
 
 	/* no handler for this stream type and we have a list to search */
 	AST_LIST_TRAVERSE(&handler_list->list, handler, next) {
-		int res = handler->create_outgoing_sdp_stream(session, session_media, answer);
+		res = handler->create_outgoing_sdp_stream(session, session_media, answer);
 		if (res < 0) {
 			/* catastrophic error */
 			return 0;
 		}
 		if (res > 0) {
-			/* handled */
+			/* Handled by this handler. Move to the next stream */
+			session_media->handler = handler;
 			return CMP_MATCH;
 		}
 	}

Modified: tags/12.3.0-rc2/res/res_pjsip_t38.c
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/res/res_pjsip_t38.c?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/res/res_pjsip_t38.c (original)
+++ tags/12.3.0-rc2/res/res_pjsip_t38.c Wed May 28 16:08:42 2014
@@ -569,21 +569,22 @@
 }
 
 /*! \brief Function which defers an incoming media stream */
-static int defer_incoming_sdp_stream(struct ast_sip_session *session, struct ast_sip_session_media *session_media,
-					 const struct pjmedia_sdp_session *sdp, const struct pjmedia_sdp_media *stream)
+static enum ast_sip_session_sdp_stream_defer defer_incoming_sdp_stream(
+	struct ast_sip_session *session, struct ast_sip_session_media *session_media,
+	const struct pjmedia_sdp_session *sdp, const struct pjmedia_sdp_media *stream)
 {
 	struct t38_state *state;
 
 	if (!session->endpoint->media.t38.enabled) {
-		return 0;
+		return AST_SIP_SESSION_SDP_DEFER_NOT_HANDLED;
 	}
 
 	if (t38_initialize_session(session, session_media)) {
-		return 0;
+		return AST_SIP_SESSION_SDP_DEFER_ERROR;
 	}
 
 	if (!(state = t38_state_get_or_alloc(session))) {
-		return 0;
+		return AST_SIP_SESSION_SDP_DEFER_ERROR;
 	}
 
 	t38_interpret_sdp(state, session, session_media, stream);
@@ -591,10 +592,10 @@
 	/* If they are initiating the re-invite we need to defer responding until later */
 	if (session->t38state == T38_DISABLED) {
 		t38_change_state(session, session_media, state, T38_PEER_REINVITE);
-		return 1;
-	}
-
-	return 0;
+		return AST_SIP_SESSION_SDP_DEFER_NEEDED;
+	}
+
+	return AST_SIP_SESSION_SDP_DEFER_NOT_NEEDED;
 }
 
 /*! \brief Function which negotiates an incoming media stream */

Modified: tags/12.3.0-rc2/rest-api/api-docs/applications.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/applications.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/applications.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/applications.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/applications.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/asterisk.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/asterisk.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/asterisk.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/asterisk.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/asterisk.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/bridges.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/bridges.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/bridges.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/bridges.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/bridges.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/channels.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/channels.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/channels.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/channels.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/channels.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/deviceStates.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/deviceStates.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/deviceStates.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/deviceStates.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "Kevin Harwell <kharwell at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/deviceStates.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/endpoints.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/endpoints.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/endpoints.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/endpoints.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/endpoints.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/events.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/events.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/events.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/events.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.2",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/events.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/mailboxes.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/mailboxes.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/mailboxes.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/mailboxes.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2013, Digium, Inc.",
 	"_author": "Jonathan Rose <jrose at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/mailboxes.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/playbacks.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/playbacks.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/playbacks.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/playbacks.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/playbacks.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/recordings.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/recordings.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/recordings.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/recordings.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/recordings.{format}",

Modified: tags/12.3.0-rc2/rest-api/api-docs/sounds.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/api-docs/sounds.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/api-docs/sounds.json (original)
+++ tags/12.3.0-rc2/rest-api/api-docs/sounds.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/sounds.{format}",

Modified: tags/12.3.0-rc2/rest-api/resources.json
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/rest-api/resources.json?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/rest-api/resources.json (original)
+++ tags/12.3.0-rc2/rest-api/resources.json Wed May 28 16:08:42 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.2.0",
+	"apiVersion": "1.3.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/ari",
 	"apis": [

Modified: tags/12.3.0-rc2/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/tags/12.3.0-rc2/tests/test_cel.c?view=diff&rev=414784&r1=414783&r2=414784
==============================================================================
--- tags/12.3.0-rc2/tests/test_cel.c (original)
+++ tags/12.3.0-rc2/tests/test_cel.c Wed May 28 16:08:42 2014
@@ -1856,6 +1856,10 @@
 
 		return !strcmp(str1, str2);
 	}
+	case AST_EVENT_IE_PLTYPE_RAW:
+	case AST_EVENT_IE_PLTYPE_BITFLAGS:
+		/* Fall through: just pass on these types */
+		return 1;
 	default:
 		break;
 	}




More information about the asterisk-commits mailing list