[svn-commits] rmudgett: branch group/ccss r1049 - /team/group/ccss/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Aug 31 12:31:07 2009
New Revision: 1049

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1049
Log:
Merged revisions 1042 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

........
  r1042 | rmudgett | 2009-08-31 12:24:19 -0500 (Mon, 31 Aug 2009) | 2 lines
  
  Split justsignalling into cis_call and cis_auto_disconnect functionality.
........

Modified:
    team/group/ccss/   (props changed)
    team/group/ccss/libpri.h
    team/group/ccss/pri.c
    team/group/ccss/q931.c

Propchange: team/group/ccss/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/ccss/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 31 12:31:07 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-1028
+/branches/1.4:1-1042

Modified: team/group/ccss/libpri.h
URL: http://svn.asterisk.org/svn-view/libpri/team/group/ccss/libpri.h?view=diff&rev=1049&r1=1048&r2=1049
==============================================================================
--- team/group/ccss/libpri.h (original)
+++ team/group/ccss/libpri.h Mon Aug 31 12:31:07 2009
@@ -1099,13 +1099,13 @@
 int pri_setup(struct pri *pri, q931_call *call, struct pri_sr *req);
 
 /*!
- * \brief Set a call has a call indpendent signalling connection (i.e. no bchan)
+ * \brief Set a call as a call indpendent signalling connection (i.e. no bchan)
  * \note Call will automaticlly disconnect after signalling sent.
  */
 int pri_sr_set_connection_call_independent(struct pri_sr *req);
 
 /*!
- * \brief Set a call has a call indpendent signalling connection (i.e. no bchan)
+ * \brief Set a call as a call indpendent signalling connection (i.e. no bchan)
  * \note Call will stay connected until explicitly disconnected.
  */
 int pri_sr_set_no_channel_call(struct pri_sr *req);

Modified: team/group/ccss/pri.c
URL: http://svn.asterisk.org/svn-view/libpri/team/group/ccss/pri.c?view=diff&rev=1049&r1=1048&r2=1049
==============================================================================
--- team/group/ccss/pri.c (original)
+++ team/group/ccss/pri.c Mon Aug 31 12:31:07 2009
@@ -1019,8 +1019,9 @@
 
 int pri_sr_set_no_channel_call(struct pri_sr *req)
 {
-	if (!req)
-		return -1;
+	if (!req) {
+		return -1;
+	}
 
 	req->cis_call = 1;
 	return 0;

Modified: team/group/ccss/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/group/ccss/q931.c?view=diff&rev=1049&r1=1048&r2=1049
==============================================================================
--- team/group/ccss/q931.c (original)
+++ team/group/ccss/q931.c Mon Aug 31 12:31:07 2009
@@ -1281,7 +1281,7 @@
 		ie->data[1] = 0x80;
 		return 4;
 	}
-	
+
 	tc = call->transcapability;
 	ie->data[0] = 0x80 | tc;
 	ie->data[1] = call->transmoderate | 0x80;
@@ -4131,7 +4131,7 @@
 	case Q931_CALL_STATE_ACTIVE:
 		/* received CONNECT */
 		if (c->cis_call) {
-			q931_release(ctrl,c,cause);
+			q931_release(ctrl, c, cause);
 			break;
 		}
 		q931_disconnect(ctrl,c,cause);