CVS: The file 'apps/bluetooth/experimental/btd.c' has been modified.

[Anders J. <and...@us...>]

The following file was modified in apps/bluetooth/experimental:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btd.c           1.33            1.34=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* When not using IPA no options to PPP is created except dev and speedstr.


The diff of the modified file(s):

--- btd.c	2001/11/22 14:42:52	1.33
+++ btd.c	2001/11/22 15:31:30	1.34
@@ -491,10 +491,6 @@
   opts[i++] =3D speedstr;
=20=20=20
   /* move these to options file ? */
-  opts[i++] =3D "crtscts";
-  opts[i++] =3D "nopersist";
-  opts[i++] =3D "silent";
-  opts[i++] =3D "passive";
=20=20=20
   /* check if we have used IPA */
   if (use_ipa && ipset)
@@ -502,6 +498,11 @@
     /* FIXME -- maybe parhand can modify ppp options=20
        file directly */
=20=20=20=20=20
+    opts[i++] =3D "crtscts";
+    opts[i++] =3D "nopersist";
+    opts[i++] =3D "silent";
+    opts[i++] =3D "passive";
+=20=20=20=20
     /* Use radius ? */
     if (ipset->useradius)
     {
@@ -605,32 +606,6 @@
     sprintf(netmask, "%s", inet_ntoa(ipset->netmask));
     opts[i++] =3D netmask;
   }
-  else
-  {=20=20=20=20
-    strcpy(local_ip, get_local_ip_address());
-=20=20=20=20
-    /* local IP */
-    sprintf(ip_addresses, "%s:", local_ip);
-
-    /* Use /etc/ppp/options file for remote ppp settings.
-       IPA is needed for correct multipoint setting or use a=20
-       ppp options file for each ttyBT e.g options.ttyBT0,=20
-       options.ttyBT1 which contains the remote IP address,=20
-       dns, wins etc*/
-=20=20=20=20
-    syslog(LOG_INFO, "WARNING: No remote ip addr set, only local %s",=20
-	   ip_addresses);
-
-    opts[i++] =3D ip_addresses;
-
-    /* always do proxyarp */=20
-    opts[i++] =3D "proxyarp";
-=20=20=20=20
-    /* ktune only works on pppd version > 2.3.10 */
-    /* similar as doing ' echo 1 > /proc/sys/net/ipv4/ip_forward */
-    opts[i++] =3D "ktune"; /* enables ip_forwarding */
-
-  } /* end -- no ipa */
=20=20=20=20
   opts[i] =3D NULL;
=20=20=20