summaryrefslogtreecommitdiffstats
path: root/share/examples
diff options
context:
space:
mode:
authorschweikh <schweikh@FreeBSD.org>2003-01-01 18:49:04 +0000
committerschweikh <schweikh@FreeBSD.org>2003-01-01 18:49:04 +0000
commitd3367c5f5d3ddcc6824d8f41c4cf179f9a5588f8 (patch)
treef412dafc7d29429919e8770cdefeb37441fc1299 /share/examples
parent718a7892bc6da2237db71c255051dd54a4e93a92 (diff)
downloadFreeBSD-src-d3367c5f5d3ddcc6824d8f41c4cf179f9a5588f8.zip
FreeBSD-src-d3367c5f5d3ddcc6824d8f41c4cf179f9a5588f8.tar.gz
Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.
Diffstat (limited to 'share/examples')
-rw-r--r--share/examples/ipfilter/examples.txt2
-rw-r--r--share/examples/ipfilter/ipf-howto.txt2
-rw-r--r--share/examples/isdn/FAQ10
-rw-r--r--share/examples/isdn/Overview10
-rw-r--r--share/examples/isdn/i4brunppp/README5
-rw-r--r--share/examples/isdn/i4brunppp/i4brunppp.c42
-rw-r--r--share/examples/ppp/ppp.conf.sample30
7 files changed, 50 insertions, 51 deletions
diff --git a/share/examples/ipfilter/examples.txt b/share/examples/ipfilter/examples.txt
index 8444908..a323a84 100644
--- a/share/examples/ipfilter/examples.txt
+++ b/share/examples/ipfilter/examples.txt
@@ -350,7 +350,7 @@ in brackets following the "return-icmp" directive:
block return-icmp (3) in proto udp from any to any port > 30000
block return-icmp (port-unr) in proto udp from any to any port > 30000
-Those two examples are equivalent, and return a ICMP port unreachable error
+Those two examples are equivalent, and return an ICMP port unreachable error
packet to in response to any UDP packet received destined for a port greater
than 30,000.
------------------------------------------------------------------------
diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt
index baef95c..73a1ecf 100644
--- a/share/examples/ipfilter/ipf-howto.txt
+++ b/share/examples/ipfilter/ipf-howto.txt
@@ -2182,7 +2182,7 @@ ing.ps.gz>
-34-
-This is a ICMP router discovery broadcast. We can tell by
+This is an ICMP router discovery broadcast. We can tell by
the ICMP type 9/0.
Finally, ipmon also lets us look at the NAT table in action.
diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ
index b8e5be4..b32ce7b 100644
--- a/share/examples/isdn/FAQ
+++ b/share/examples/isdn/FAQ
@@ -485,16 +485,16 @@ kind of problem to look into his BIOS.
i4b now works for me, I had a USB-device interfering on IRQ 9,
which was supposed to be only for my Creatix Card.
(NetBSD 1.3, Creatix)
-
+
Strange enough, my DOS s0-test worked, are they just polling the card?
-
+
Even when the testsoftware under DOS is working, don't be shure, that
your hw-setup is correct for xxx(x)BSD. Triplecheck all your IRQ and
enable and disable PNP to triple-verify. Even unconfigured devices can
block your card. .....
-
+
And that took me more than 2 months to discover :-((((
-
+
(from Andreas Lohrum, andreas.lohrum@consol.de)
@@ -1016,7 +1016,7 @@ But I could not use the card, because I forgot
Q: Hi,
- I am trying to set up a ELSA QuickStep 1000pro PCI ISDN adaptor in a FreeBSD
+ I am trying to set up an ELSA QuickStep 1000pro PCI ISDN adaptor in a FreeBSD
3.3 box. I configured the kernel according to the i4b.ps documentation. At
boottime, these messages are displayed:
diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview
index e8e09e2..8313506 100644
--- a/share/examples/isdn/Overview
+++ b/share/examples/isdn/Overview
@@ -18,7 +18,7 @@ Contents:
Layer 2
Layer 3
Debugging control
- Layer 4
+ Layer 4
ISDN protocol trace
@@ -43,7 +43,7 @@ Functional block diagram
| debug | | Layer 4 - common call control interface | | ISDN |
|control| | | | trace |
+:-:-:--+ +----------------------------------------------------+ +--------+
- : : : ^ ^ ^
+ : : : ^ ^ ^
: : : Call | various ptr arrays | Call %
. . . Control | in i4b_l3l4.h | Control %
V V %
@@ -111,14 +111,14 @@ Layer 1
routines. These routines handle the card/manufacturer specific stuff
required to talk to a particular card.
- This addresses of the read/write routines are put into a arrays found
+ The addresses of the read/write routines are put into an array found
in struct isic_softc and they are later called by the macros:
ISAC_READ(r), ISAC_WRITE(r,v), ISAC_RDFIFO(b,s), ISAC_WRFIFO(b,s),
HSCX_READ(n,r), HSCX_WRITE(n,r,v), HSCX_RDFIFO(n,b,s), HSCX_WRFIFO(n,b,s)
(see file layer1/i4b_l1.h)
-
+
Files currently used for this purpose are
- i4b_avm_a1.c AVM A1 and AVM Fritz!Card drivers
- i4b_ctx_s0P.c Creatix S0 PnP (experimental!)
@@ -256,7 +256,7 @@ Debugging control
sources. It is only usable for passive cards.
-Layer 4
+Layer 4
=======
(7) Layer 4 is "just" an abstraction layer used to shield the differences
diff --git a/share/examples/isdn/i4brunppp/README b/share/examples/isdn/i4brunppp/README
index ea0ba9a..81ebe75 100644
--- a/share/examples/isdn/i4brunppp/README
+++ b/share/examples/isdn/i4brunppp/README
@@ -3,12 +3,12 @@ $FreeBSD$
BEWARE: HIGHLY EXPERIMENTAL!
---------------------------
-This program is used in conjunction with a isdnd.rc entry similar to
+This program is used in conjunction with an isdnd.rc entry similar to
regexpr = "ULPPP.*call active" # look for matches in log messages
regprog = i4brunppp # execute program when match is found
-this one (see also i4brunppp-isdnd.rc).
+this one (see also i4brunppp-isdnd.rc).
i4brunppp _must_ be put into /etc/isdn!
@@ -16,4 +16,3 @@ When an active call is detected, isdnd fires off i4brunppp, which attaches
the rbch device used to stdin/stdout and then runs ppp which is given the
"-direct" command and the string "inc_rbchX" (where X is the i4brbch unit
number) as arguments.
-
diff --git a/share/examples/isdn/i4brunppp/i4brunppp.c b/share/examples/isdn/i4brunppp/i4brunppp.c
index cb239d8..7d1fe3c 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp.c
+++ b/share/examples/isdn/i4brunppp/i4brunppp.c
@@ -35,8 +35,8 @@
*
* BEWARE: HIGHLY EXPERIMENTAL!
* ---------------------------
- *
- * This program is used in conjunction with a isdnd.rc entry similar to
+ *
+ * This program is used in conjunction with an isdnd.rc entry similar to
*
* regexpr = "ULPPP.*call active" # look for matches in log messages
* regprog = i4brunppp # execute program when match is found
@@ -62,7 +62,7 @@
#include <machine/i4b_ioctl.h>
#include <machine/i4b_rbch_ioctl.h>
-#define I4BDEVICE "/dev/i4b"
+#define I4BDEVICE "/dev/i4b"
#define PPPPROG "/usr/sbin/ppp"
#define PPPNAME "ppp"
@@ -85,21 +85,21 @@ main(int argc, char **argv)
char *p = "DeadPointer";
int found;
int i;
-
+
#ifdef PPPDEBUG
FILE *dfp;
time_t tim;
register struct tm *tp;
#endif
-
+
/* open syslog */
-
+
(void)openlog("i4brunppp", LOG_PID|LOG_CONS|LOG_NDELAY, LOG_USER);
#ifdef PPPDEBUG
/* open debug log */
-
+
if((dfp = fopen("/tmp/i4brunppp-debug.log", "a")) == NULL)
{
syslog(LOG_INFO, "cannot open logfile: %s", strerror(errno));
@@ -116,9 +116,9 @@ main(int argc, char **argv)
#endif
/* check if this is the right message */
-
+
found = 0;
-
+
for(i=0; i < argc; i++)
{
if((strstr(argv[i], VERIFYSTRING)) != NULL)
@@ -135,11 +135,11 @@ main(int argc, char **argv)
#endif
exit(0);
}
-
+
found = 0;
/* check if we got a good device name */
-
+
for(; i < argc; i++)
{
if((p = strstr(argv[i], DEVSTRING)) != NULL)
@@ -157,10 +157,10 @@ main(int argc, char **argv)
exit(0);
}
- /* everything ok, now prepare for running ppp */
+ /* everything ok, now prepare for running ppp */
/* close all file descriptors */
-
+
i = getdtablesize();
for(;i >= 0; i--)
@@ -168,7 +168,7 @@ main(int argc, char **argv)
close(i);
/* fiddle a terminating zero after the rbch unit number */
-
+
p += strlen(DEVSTRING);
if(isdigit(*p) && isdigit(*(p+1)))
@@ -177,16 +177,16 @@ main(int argc, char **argv)
*(p+1) = '\0';
/* construct /dev/i4brbchX device name */
-
+
sprintf(buffer, "%s%s%s", I4BDEVICE, DEVSTRING, p);
/* open the rbch device as fd 0 = stdin */
-
+
rbch_fd = open(buffer, O_RDWR);
if(rbch_fd != 0)
{
- if(rbch_fd < 0)
+ if(rbch_fd < 0)
syslog(LOG_INFO, "cannot open %s: %s", buffer, strerror(errno));
else
syslog(LOG_INFO, "cannot open %s as fd 0 (is %d): %s", buffer, rbch_fd, strerror(errno));
@@ -194,10 +194,10 @@ main(int argc, char **argv)
}
/* dup rbch device fd as fd 1 = stdout */
-
+
if((i = dup(rbch_fd)) != 1)
{
- if(i < 0)
+ if(i < 0)
syslog(LOG_INFO, "cannot dup rbch_fd: %s", strerror(errno));
else
syslog(LOG_INFO, "cannot dup rbch as fd 1 (is %d): %s", i, strerror(errno));
@@ -205,13 +205,13 @@ main(int argc, char **argv)
}
/* construct the label for ppp's ppp.conf file */
-
+
sprintf(buffer, "%s%s%s", PPPLABEL, DEVSTRING, p);
syslog(LOG_INFO, "executing: %s %s %s %s", PPPPROG, PPPNAME, PPPARG1, buffer);
/* execute ppp */
-
+
if((execl(PPPPROG, PPPNAME, PPPARG1, buffer, NULL)) == -1)
{
syslog(LOG_INFO, "cannot exec: %s", strerror(errno));
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index db6cdf1..9d0539d 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -108,7 +108,7 @@ PAPorCHAPpmdemand:
#
# With static IP numbers, our setup is similar to dynamic:
# Remember, ppp.linkup is searched for a "192.244.176.44" label, then
-# a "ondemand" label, and finally the "MYADDR" label.
+# an "ondemand" label, and finally the "MYADDR" label.
#
ondemand:
set phone 1234567
@@ -354,16 +354,16 @@ dodgynet:
# If the remote host allowed IP forwarding and we wanted to use it, the
# following rules could be split into two groups to separately validate
# the source and destination addresses.
- set filter dial 7 permit 172.17.16.0/20 172.17.20.248
- set filter dial 8 permit 172.17.36.0/22 172.17.20.248
- set filter dial 9 permit 172.17.118.0/26 172.17.20.248
- set filter dial 10 permit 10.123.5.0/24 172.17.20.248
+ set filter dial 7 permit 172.17.16.0/20 172.17.20.248
+ set filter dial 8 permit 172.17.36.0/22 172.17.20.248
+ set filter dial 9 permit 172.17.118.0/26 172.17.20.248
+ set filter dial 10 permit 10.123.5.0/24 172.17.20.248
# Once the link's up, limit outgoing access to the specified hosts
- set filter out 0 4 172.17.16.0/20 172.17.20.248
- set filter out 1 4 172.17.36.0/22 172.17.20.248
- set filter out 2 4 172.17.118.0/26 172.17.20.248
- set filter out 3 deny ! 10.123.5.0/24 172.17.20.248
+ set filter out 0 4 172.17.16.0/20 172.17.20.248
+ set filter out 1 4 172.17.36.0/22 172.17.20.248
+ set filter out 2 4 172.17.118.0/26 172.17.20.248
+ set filter out 3 deny ! 10.123.5.0/24 172.17.20.248
# Allow established TCP connections
set filter out 4 permit 0 0 tcp estab
@@ -481,7 +481,7 @@ direct-client:
set ifaddr 10.0.4.2 10.0.4.1
enable lqr
accept lqr
-
+
direct-server:
set timeout 0
set lqrperiod 10
@@ -567,7 +567,7 @@ inet-loop:
set login
set ifaddr 127.0.0.2 127.0.0.3
set server /var/run/ppp/loop "" 0177
-
+
inet-loop-in:
set timeout 0
set log phase lcp ipcp command
@@ -687,8 +687,8 @@ mloop:
clone 1 2 3
link deflink remove
# dial
- # link 2 dial
- # link 3 dial
+ # link 2 dial
+ # link 3 dial
mloop-in:
set timeout 0 # No idle timer
@@ -780,10 +780,10 @@ loop:
set device "!ppp -direct loop-in"
set dial
set login
- set ifaddr 10.0.1.1/0 10.0.10.1-10.0.19.255
+ set ifaddr 10.0.1.1/0 10.0.10.1-10.0.19.255
disable deflate pred1 mppe
deny deflate pred1 mppe
-
+
loop-in:
set timeout 0
set log
OpenPOWER on IntegriCloud