Minor typo.

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.4.11.2@1817 2fbb986a-6c06-0410-b554-c9c1f0a7f128

.version

@@ -1 +1 @@
-1.4.11.1
+1.4.11.2

ChangeLog

@@ -1,3 +1,18 @@
+2010-06-02 Leif Madsen <lmadsen@digium.com>
+
+	* libpri 1.4.11.2 released.
+
+2010-06-04 17:45 +0000 [r1810]  Richard Mudgett <rmudgett@digium.com>
+
+	* pri_facility.c: Q.SIG calling name in FACILITY message not
+	  reported to the upper layer. Q.SIG can send the CallingName,
+	  CalledName, and ConnectedName in stand alone FACILITY messages.
+	  If the CallingName was not sent in the SETUP message, the caller
+	  id name was not reported to the upper layer. (closes issue #17458)
+	  Reported by: jsmith Patches: issue17458_post_qsig_name.patch uploaded
+	  by rmudgett (license 664) issue17458_post_qsig_name_v1.4.11.1.patch
+	  uploaded by rmudgett (license 664) Tested by: rmudgett, jsmith
+
 2010-06-02 Leif Madsen <lmadsen@digium.com>
 
 	* libpri 1.4.11.1 released.

pri_facility.c

@@ -3745,25 +3745,65 @@ void rose_handle_invoke(struct pri *ctrl, q931_call *call, int msgtype, q931_ie
 		/* CallingName is put in remote_id.name */
 		rose_copy_name_to_q931(ctrl, &call->remote_id.name,
 			&invoke->args.qsig.CallingName.name);
+
+		switch (msgtype) {
+		case Q931_SETUP:
+		case Q931_CONNECT:
+			/* The caller name will automatically be reported. */
+			break;
+		default:
+			/* Setup connected line subcommand */
+			subcmd = q931_alloc_subcommand(ctrl);
+			if (!subcmd) {
+				break;
+			}
+			subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
+			q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
+			break;
+		}
 		break;
 	case ROSE_QSIG_CalledName:
 		/* CalledName is put in remote_id.name */
 		rose_copy_name_to_q931(ctrl, &call->remote_id.name,
 			&invoke->args.qsig.CalledName.name);
 
-		/* Setup connected line subcommand */
-		subcmd = q931_alloc_subcommand(ctrl);
-		if (!subcmd) {
+		switch (msgtype) {
+		case Q931_SETUP:
+		case Q931_CONNECT:
+			/* The called name will automatically be reported. */
 			pri_error(ctrl, "ERROR: Too many facility subcommands\n");
 			break;
+		default:
+			/* Setup connected line subcommand */
+			subcmd = q931_alloc_subcommand(ctrl);
+			if (!subcmd) {
+				break;
+			}
+			subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
+			q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
+			break;
 		}
-		subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
-		q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
 		break;
 	case ROSE_QSIG_ConnectedName:
 		/* ConnectedName is put in remote_id.name */
 		rose_copy_name_to_q931(ctrl, &call->remote_id.name,
 			&invoke->args.qsig.ConnectedName.name);
+
+		switch (msgtype) {
+		case Q931_SETUP:
+		case Q931_CONNECT:
+			/* The connected line name will automatically be reported. */
+			break;
+		default:
+			/* Setup connected line subcommand */
+			subcmd = q931_alloc_subcommand(ctrl);
+			if (!subcmd) {
+				break;
+			}
+			subcmd->cmd = PRI_SUBCMD_CONNECTED_LINE;
+			q931_party_id_copy_to_pri(&subcmd->u.connected_line.id, &call->remote_id);
+			break;
+		}
 		break;
 #if 0	/* Not handled yet */
 	case ROSE_QSIG_BusyName: