openbt-commit

CVS: The file 'linux/drivers/char/bluetooth/rfcomm_sec.c' has been modified.

[Mattias ?g. <mat...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
rfcomm_sec.c    1.6             1.7=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Fixed bug when using security and connecting as client.
  Added validity check so we don't register on control channel (dlci 0)



The diff of the modified file(s):

--- rfcomm_sec.c	2001/02/15 18:01:29	1.6
+++ rfcomm_sec.c	2001/02/26 16:12:17	1.7
@@ -109,13 +109,12 @@
 	case SECURITY_OK:=20
 	{
 		rfcon->dlci[tmp_dlci].state =3D CONNECTED;
-#ifdef __KERNEL__
-		bt_register_rfcomm(rfcon, tmp_dlci);
-		bt_connect_cfm(CREATE_RFCOMM_ID(rfcon->line, tmp_dlci), 0 /* status ok*/=
 );
=20
-#endif
-/*		D_REC(FNC"sending back UA - other channel\n"); */
+		if (valid_dlci(tmp_dlci))
+		{
=20
+			bt_register_rfcomm(rfcon, tmp_dlci);
+			bt_connect_cfm(CREATE_RFCOMM_ID(rfcon->line, tmp_dlci), 0 /* status ok*=
/ );=09=09=09
 #if 0
 		/* This part was taken from rfcomm.c and should perhaps
 		   reside there */
@@ -134,7 +133,11 @@
 #endif
=20
 		rfcomm_ua_msg(rfcon, tmp_dlci);
-=09=09
+		}
+		else
+		{
+			printk("rfcomm_process_sec_man_response : invalid dlci [%d]\n", tmp_dlc=
i);
+		}
 		break;
 	}
 	case UNKNOWN_REQUEST_TYPE:

CVS: The file 'linux/drivers/char/bluetooth/rfcomm_sec.c' has been modified.

[Peter K. <pk...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
rfcomm_sec.c    1.7             1.8=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Minor clean-up.


The diff of the modified file(s):

--- rfcomm_sec.c	2001/02/26 16:12:17	1.7
+++ rfcomm_sec.c	2001/02/27 11:32:19	1.8
@@ -68,23 +68,18 @@
=20
 /****************** DEBUG CONSTANT AND MACRO SECTION *********************=
***/
=20
-
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-
 /****************** TYPE DEFINITION SECTION ******************************=
***/
=20
-
 /****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
=20
 /****************** GLOBAL VARIABLE DECLARATION SECTION ******************=
***/
=20
 /****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
=20
-
 /****************** FUNCTION DEFINITION SECTION **************************=
***/
=20=20=20
-
 void=20
 rfcomm_sec_man_init(void)
 {
@@ -107,7 +102,6 @@
=20=09
 	switch (result) {
 	case SECURITY_OK:=20
-	{
 		rfcon->dlci[tmp_dlci].state =3D CONNECTED;
=20
 		if (valid_dlci(tmp_dlci))
@@ -115,6 +109,7 @@
=20=09=09=09
 			bt_register_rfcomm(rfcon, tmp_dlci);
 			bt_connect_cfm(CREATE_RFCOMM_ID(rfcon->line, tmp_dlci), 0 /* status ok*=
/ );=09=09=09
+
 #if 0
 			/* This part was taken from rfcomm.c and should perhaps
 			   reside there */
@@ -139,38 +134,31 @@
 			printk("rfcomm_process_sec_man_response : invalid dlci [%d]\n", tmp_dlc=
i);
 		}
 		break;
-	}
+
 	case UNKNOWN_REQUEST_TYPE:
 	case UNKNOWN_REQUEST_VALUE:
-	{
 		/* send negative connection response */
 		rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
 		rfcomm_dm_msg(rfcon,tmp_dlci);
-
 		break;
-	}
+
 	case PSM_SECURITY_BLOCK:
 	case AUTHENTICATION_FAILURE:
 	case ENCRYPTION_FAILURE:
-	{
 		/* send negative connection response */
 		rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
 		rfcomm_dm_msg(rfcon,tmp_dlci);
-
 		break;
-	}
+
 	case GENERAL_FAILURE:
-	{
 		/* send negative connection response */
 		rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
 		rfcomm_dm_msg(rfcon,tmp_dlci);
-
 		break;
-	}
+
 	default:
-	{
 		/* Print error message */
-	}
+		break;
 	}
 }
=20

CVS: The file 'linux/drivers/char/bluetooth/rfcomm_sec.c' has been modified.

[Peter K. <pk...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
rfcomm_sec.c    1.8             1.9=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added missing include of bluetooth.h (for user mode).


The diff of the modified file(s):

--- rfcomm_sec.c	2001/02/27 11:32:19	1.8
+++ rfcomm_sec.c	2001/09/10 15:32:55	1.9
@@ -58,6 +58,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
+#include "include/bluetooth.h"
 #include "include/l2cap.h"
 #include "include/rfcomm.h"
 #include "include/rfcomm_internal.h"

CVS: The file 'linux/drivers/char/bluetooth/rfcomm_sec.c' has been modified.

[Willy S. <sag...@us...>]

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

Name          Old version  New version  Tag  Comment
----          -----------  -----------  ---  -------
rfcomm_sec.c  1.9          1.10=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added version ifdef for malloc.h/slab.h


The diff of the modified file(s):

--- rfcomm_sec.c	10 Sep 2001 15:32:55 -0000	1.9
+++ rfcomm_sec.c	11 Apr 2002 11:49:49 -0000	1.10
@@ -45,7 +45,11 @@
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
 #ifdef __KERNEL__
+#if LINUX_VERSION_CODE >=3D 0x20200
+#include <linux/slab.h>
+#else
 #include <linux/malloc.h>
+#endif
 #include <linux/bluetooth/bluetooth.h>
 #include <linux/bluetooth/l2cap.h>
 #include <linux/bluetooth/rfcomm.h>