[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: OpenBSD 3.3-current and i4b experiment
begin electrogrammati illius Robert Porl
>On Sat, 17 May 2003, Thorsten Glaser wrote:
>
>> >over src/usr.sbin/isdnd/*, i can neither find the string
>> >"rbch" nor "bchan" in any of isdnd's source files.
>> >How can that be ?
>>
>> It just uses it as device.
>
>Yes, but...
>The config parser reports that both "rbch" and "bchan" are
>unknown arguments to "usrdevicename". It is _not_ an error
I'm sitting here at a friend and sending this over ISDN,
with a MirBSD box in between.
The diffs I applied since today were:
Index: etc/isdnd.rc.sample
===================================================================
RCS file: /lcvs/src/etc/isdnd.rc.sample,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- etc/isdnd.rc.sample 6 Apr 2003 14:19:59 -0000 1.1
+++ etc/isdnd.rc.sample 17 May 2003 19:42:00 -0000 1.3
@@ -3,7 +3,7 @@
# example of a configuration file for the isdn daemon
# ---------------------------------------------------
#
-# $MirBSD: isdnd.rc.sample,v 1.1 2003/04/06 14:20:21 tg Exp $
+# $MirBSD: isdnd.rc.sample,v 1.3 2003/05/17 19:42:22 tg Exp $
# $NetBSD: isdnd.rc.sample,v 1.4 2002/04/11 09:08:19 martin Exp $
#
# last edit-date: [Wed Jul 19 09:59:42 2000]
@@ -321,7 +321,7 @@
#==============================================================================
entry
name = userppp0 # name of entry
-usrdevicename = rbch # use the raw b channel access device
+usrdevicename = isdnbchan # use the raw b channel access device
usrdeviceunit = 0 # unit 0
isdncontroller = 0 # use isdn controller 0
@@ -356,7 +356,7 @@
entry
name = userppp1
-usrdevicename = rbch
+usrdevicename = isdnbchan
usrdeviceunit = 1
isdncontroller = 0
isdnchannel = -1
Index: etc/isdnd.sppp.sample
===================================================================
RCS file: /lcvs/src/etc/isdnd.sppp.sample,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- etc/isdnd.sppp.sample 12 Apr 2003 18:25:30 -0000 1.1
+++ etc/isdnd.sppp.sample 17 May 2003 19:42:00 -0000 1.3
@@ -1,4 +1,4 @@
-# $MirBSD: isdnd.sppp.sample,v 1.1 2003/04/12 18:25:52 tg Exp $
+# $MirBSD: isdnd.sppp.sample,v 1.3 2003/05/17 19:42:22 tg Exp $
system
@@ -7,12 +7,13 @@
useacctfile = no
monitor-allowed = off
ratesfile = /etc/isdn/isdnd.rates
+holidayfile = /dev/null
rtprio = 25
entry
name = userppp0
-usrdevicename = rbch
+usrdevicename = isdnbchan
usrdeviceunit = 0
isdncontroller = 0
isdnchannel = -1
Index: sys/dev/pci/ifpci.c
===================================================================
RCS file: /lcvs/src/sys/dev/pci/ifpci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sys/dev/pci/ifpci.c 14 May 2003 19:54:48 -0000 1.2
+++ sys/dev/pci/ifpci.c 17 May 2003 18:48:16 -0000 1.3
@@ -35,7 +35,7 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci.c,v 1.2 2003/05/14 19:55:10 tg Exp $
+ * $Id: ifpci.c,v 1.3 2003/05/17 18:48:38 tg Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
@@ -287,6 +287,14 @@
/* announce */
printf(": Fritz!PCI card\n");
+ /* init higher protocol layers */
+ drv = isdn_attach_bri(sc->sc_dev.dv_xname,
+ "AVM Fritz!PCI", &sc->sc_l2, &ifpci_l3_driver);
+ sc->sc_l3token = drv;
+ sc->sc_l2.driver = &isic_std_driver;
+ sc->sc_l2.l1_token = sc;
+ sc->sc_l2.drv = drv;
+
/* setup io mappings */
sc->sc_cardtyp = CARD_TYPEP_AVMA1PCI;
sc->sc_num_mappings = 1;
@@ -384,13 +392,7 @@
sc->sc_obuf2 = NULL;
sc->sc_freeflag2 = 0;
- /* init higher protocol layers */
- drv = isdn_attach_bri(sc->sc_dev.dv_xname,
- "AVM Fritz!PCI", &sc->sc_l2, &ifpci_l3_driver);
- sc->sc_l3token = drv;
- sc->sc_l2.driver = &isic_std_driver;
- sc->sc_l2.l1_token = sc;
- sc->sc_l2.drv = drv;
+ /* Activate higher protocol layers */
isdn_layer2_status_ind(&sc->sc_l2, drv, STI_ATTACH, 1);
isdn_bri_ready(drv->bri);
}
Index: sys/dev/pci/ifpci2.c
===================================================================
RCS file: /lcvs/src/sys/dev/pci/ifpci2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sys/dev/pci/ifpci2.c 14 May 2003 19:54:49 -0000 1.2
+++ sys/dev/pci/ifpci2.c 17 May 2003 18:48:17 -0000 1.3
@@ -36,7 +36,7 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci2.c,v 1.2 2003/05/14 19:55:11 tg Exp $
+ * $Id: ifpci2.c,v 1.3 2003/05/17 18:48:39 tg Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
@@ -257,6 +257,14 @@
/* announce */
printf(": Fritz!PCI V2 card\n");
+ /* init higher protocol layers */
+ drv = isdn_attach_bri(sc->sc_dev.dv_xname,
+ "AVM Fritz!PCI V2", &sc->sc_l2, &ifpci2_l3_driver);
+ sc->sc_l3token = drv;
+ sc->sc_l2.driver = &isic_std_driver;
+ sc->sc_l2.l1_token = sc;
+ sc->sc_l2.drv = drv;
+
/* setup io mappings */
sc->sc_num_mappings = 1;
MALLOC_MAPS(sc);
@@ -343,13 +351,7 @@
sc->sc_obuf2 = NULL;
sc->sc_freeflag2 = 0;
- /* init higher protocol layers */
- drv = isdn_attach_bri(sc->sc_dev.dv_xname,
- "AVM Fritz!PCI V2", &sc->sc_l2, &ifpci2_l3_driver);
- sc->sc_l3token = drv;
- sc->sc_l2.driver = &isic_std_driver;
- sc->sc_l2.l1_token = sc;
- sc->sc_l2.drv = drv;
+ /* Activate higher protocol layers */
isdn_layer2_status_ind(&sc->sc_l2, drv, STI_ATTACH, 1);
isdn_bri_ready(drv->bri);
}
Index: etc/ppp/ppp.conf.sample
===================================================================
RCS file: /lcvs/src/etc/ppp/ppp.conf.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- etc/ppp/ppp.conf.sample 12 Apr 2003 20:19:59 -0000 1.4
+++ etc/ppp/ppp.conf.sample 17 May 2003 19:42:01 -0000 1.5
@@ -4,7 +4,7 @@
#
# Originally written by Toshiharu OHNO
#
-# $MirBSD: ppp.conf.sample,v 1.4 2003/04/12 20:20:21 tg Exp $
+# $MirBSD: ppp.conf.sample,v 1.5 2003/05/17 19:42:23 tg Exp $
# $OpenBSD: ppp.conf.sample,v 1.21 2002/06/09 06:15:15 todd Exp $
#
#################################################################
@@ -531,7 +531,7 @@
# Sorry, I use pppd(8) for this purpose.
# 1. ADSL with PPPoE
-mirADSL:
+MirADSL:
# Adjust: ne3 => NIC where your ADSL modem sits on
set device "!/usr/sbin/pppoe -i ne3"
set speed sync
@@ -551,11 +551,12 @@
set authkey "secret-passsword"
# 2. ISDN with SyncPPP and Dial-On-Demand
-mirISDN:
+MirISDN:
set device /dev/isdnbchan0
set speed sync
- disable ipv6cp
+ disable ipv6cp mppe
set timeout 0
+ set cd 6
set login
set ifaddr 0.0.0.0/0 0.0.0.1/0 255.255.255.0 0.0.0.0
add default HISADDR
They fix the following:
- dial in works with
# isdnd
# ppp -ddial MirISDN
- it doesn't crash on a 400 MHz Pentium II with
FritzCard PCI any more because an IRQ occured in
the small timeframe between setting up the IRQ
handler and clearing up/resetting the card
- fix some ppp warnings etc.
//Thorsten
--
Willst Du wegen dummer User immer 'Ja, ich will' nach einem rm an /dev/tty
eingeben müssen? -- Bodo Eggert in de.alt.sysadmin.recovery