openbt-commit Mailing List for AXIS OpenBT Stack (Page 23)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
rfcomm.c        1.116           1.117=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* fixed auto shutdown of all rfcomm connections if stack is taken=20
  down during active sessions.
* fixed bug in get_connected_dlci, now returns -1 if no connected=20
  dlci was found.
* added some fixme:s ...
* cleanup


The diff of the modified file(s):

--- rfcomm.c	2001/07/09 09:48:37	1.116
+++ rfcomm.c	2001/08/02 15:45:15	1.117
@@ -690,16 +690,19 @@
=20=20=20
 	DSYS("Shutting down RFCOMM\n");
=20
-#if 0
 	/* First try disconnecting */
 	for (i =3D 0; i < BT_NBR_DATAPORTS; i++) {
 		rfcomm_con *rfcomm =3D get_rfcomm_con(i);
-		if (get_connected_dlci(rfcomm) !=3D -1) {
+
+		/* fixme -- handle the case where only the control=20
+		   channel is left on a rfcomm session */
+
+		if (get_connected_dlci(rfcomm) > 0) {
 			DSYS(FNC"Now disconnecting rfcomm line %d\n", i);
 			rfcomm_disconnect_req(i);
 		}=09=09
 	}
-#endif
+
 	/* If still connections left, terminate them */
 	for (i =3D 0; i < BT_NBR_DATAPORTS; i++) {
 		rfcomm_reset_con(i);
@@ -749,9 +752,10 @@
 		/* we have an l2cap channel (server ch) */
 		D_CTRL(FNC"we already have an l2cap channel)\n");
=20
+		/* fixme -- strange case ... */
 		if (rfcomm->dlci[0].state !=3D DISCONNECTED) {
 			D_ERR(FNC"DLCI:0 neither CONNECTED nor DISCONNECTED\n");
-			return 0;
+			return -1;
 		} else {
 			rfcomm->dlci[0].state =3D CONNECTING;
 			/* Establish the control channel */
@@ -771,11 +775,12 @@
 			    tmp_dlci, TRUE);
 	}
=20
-	/* ? never used ? */
-	return line;
-
+	return 0;
 }
=20
+
+/* fixme -- this should be on dlci/rfcomm con basis not line ... */
+
 s32
 rfcomm_disconnect_req(u8 line)
 {
@@ -805,8 +810,8 @@
=20
 		/* FIXME -- check that we haven't already received=20
 		   disconnect 'acknowledge' */
-
 		interruptible_sleep_on(&rfcomm_disconnect_wq);
+
 		/* Check that rfcomm session really disconnected */
 		/* FIXME -- add timer obj with status in rfcomm obj */
=20
@@ -844,6 +849,9 @@
 	D_CTRL("rfcomm_connect_ind\n");=20=20
 	if (!(rfcomm =3D get_new_rfcomm_con())) {
 		D_ERR("rfcomm_connect_ind: error: couldn't find free tty\n");
+=09=09
+		/* fixme -- respond neg ! */
+
 		return;
 	} else {
=20=20=20=20=20=20=20=20=20=20=20
@@ -1127,6 +1135,9 @@
 #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
                         rfcomm_check_allowed_security(rfcomm->l2cap->remot=
e_bd,
                                                       tmp_dlci, rfcomm);
+
+			/* fixme -- check result and send neg response if not allowed */
+=09=09=09
 #else
 			bt_connect_ind(CREATE_RFCOMM_ID(rfcomm->line, tmp_dlci));
 			rfcomm->dlci[tmp_dlci].state =3D CONNECTED;
@@ -1152,12 +1163,15 @@
 		break;
=20=20=20=20=20
 	case UA:
-		D_CTRL(FNC"UA packet received\n");=20
 		rfcomm =3D ((rfcomm_con*) l2cap->upper_con);
+
 		if (rfcomm->magic !=3D RFCOMM_MAGIC) {
 			D_ERR(FNC"Invalid magic number\n");
 			break;
 		}
+=09=09
+		D_CTRL(FNC"UA packet received on line %d\n", rfcomm->line);
+
 		if (rfcomm->dlci[0].state =3D=3D CONNECTING) {
 			/* Now we are the initiating side and we have got a
 			   respons to our SABM command. We then send a PN
@@ -1190,22 +1204,31 @@
 			rfcomm->dlci[tmp_dlci].initiator =3D TRUE;
=20
 		} else if (rfcomm->dlci[tmp_dlci].state =3D=3D DISCONNECTING) {
+=09=09=20=20
 			if (tmp_dlci =3D=3D 0) {
+				/* Control channel */
 #ifdef __KERNEL__=09=09=09
 				release_wq_timer(&rfcomm_timer);
 #endif
-				printk(FNC"RFCOMM disconnected ctrl ch (local)\n");
+				DSYS(FNC"RFCOMM disconnected ctrl ch (local) on line [%d]\n", rfcomm->=
line);
 				rfcomm->dlci[0].state =3D DISCONNECTED;
=20=09=09=09=09
 				/* this will take down l2cap aswell */
 				wake_up_interruptible(&rfcomm_disconnect_wq);
=20=09=09=09=09
 			} else {
+				/* Data channel */
 				s32 tmp;
 				rfcomm->dlci[tmp_dlci].state =3D DISCONNECTED;
 				tmp =3D get_connected_dlci(rfcomm);
+
+				if (tmp >=3D 0) {
 				rfcomm->dlci[tmp].state =3D DISCONNECTING;
 				send_disc(rfcomm, tmp);
+				} else {
+					D_ERR("Could not find connected DLCI\n");
+				}
+=09=09=09=09
 			}
 		} else if (rfcomm->dlci[tmp_dlci].state =3D=3D DISCONNECTED) {
 			rfcomm->dlci[tmp_dlci].state =3D CONNECTED;
@@ -1219,6 +1242,10 @@
 		D_CTRL(FNC"DM packet received\n");
 		rfcomm =3D ((rfcomm_con*) l2cap->upper_con);
 		rfcomm->dlci[tmp_dlci].state =3D DISCONNECTED;
+
+		/* Notify upper tty */
+		/* bt_disconnect_ind() ? */
+
 		break;
=20=20=20=20=20
 	case DISC:
@@ -1233,8 +1260,7 @@
 			send_dm(rfcomm, tmp_dlci);
 		} else if ((short_pkt->h.addr.server_chn) =3D=3D 0) {
 			rfcomm->dlci[0].state =3D DISCONNECTED;
-			/* FIXME:
-			   Tell the tty that the link is down */
+
 			printk("RFCOMM control ch disconnected (remotely)\n");
 			send_ua(rfcomm, 0);
 #ifdef __KERNEL__
@@ -1247,8 +1273,6 @@
 			bt_disconnect_ind(CREATE_RFCOMM_ID(rfcomm->line,=20
 							   tmp_dlci));
 		}
-		D_CTRL(FNC"DISC, sending back UA\n");
-=20=20=20=20
 		break;
=20=20=20=20=20
 	case UIH:
@@ -1610,6 +1634,7 @@
 			nbrof_credits =3D pn_pkt->credits;=09=09=09
 			if (credit) {
 				DSYS(FNC"Using credit flow control, initiating credits are %d on dlci =
%d\n", nbrof_credits, tmp_dlci);
+
 				rfcomm->credit_flow =3D TRUE;
 				rfcomm->dlci[tmp_dlci].local_credits =3D nbrof_credits;
 				D_CTRL(FNC"Local credits:%d\n", rfcomm->dlci[tmp_dlci].local_credits);=
=20
@@ -2394,6 +2419,7 @@
=20
 }
=20
+
 rfcomm_con*=20
 get_new_rfcomm_con(void)
 {
@@ -2428,15 +2454,18 @@
 	}
 }
=20
+/* fetches the 'last' non DISCONNECTED dlci number in this session,=20
+   returns -1 if no connected dlci was found */
+
 s32 get_connected_dlci(rfcomm_con *rfcomm)
 {
 	s32 tmp;
=20
 	tmp =3D 61;
-	while ((tmp > 0) && (rfcomm->dlci[tmp].state =3D=3D DISCONNECTED)) {
+	while ((tmp >=3D 0) && (rfcomm !=3D NULL) &&=20
+	       (rfcomm->dlci[tmp].state =3D=3D DISCONNECTED)) {
 		tmp--;
 	}
-
 	return tmp;
 }
=20




2001	Jan	Feb (44)	Mar (202)	Apr (134)	May (89)	Jun (94)	Jul (58)	Aug (58)	Sep (56)	Oct (75)	Nov (26)	Dec (14)
2002	Jan (24)	Feb (30)	Mar (15)	Apr (49)	May (12)	Jun (6)	Jul (11)	Aug (20)	Sep (19)	Oct (3)	Nov (13)	Dec (1)
2003	Jan (7)	Feb (4)	Mar (7)	Apr (5)	May (6)	Jun (3)	Jul (1)	Aug (1)	Sep	Oct (2)	Nov (51)	Dec (1)
2004	Jan (11)	Feb (5)	Mar	Apr (5)	May (2)	Jun	Jul (21)	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

openbt-commit Mailing List for AXIS OpenBT Stack (Page 23)

openbt-commit — CVS commits to the AXIS OpenBT Stack