Advertisement
teknoraver

doc RFC 5735

Oct 15th, 2019
411
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 11.11 KB | None | 0 0
  1. From f015ba50c8cecebe02f5a32bae2f57dfcb680942 Mon Sep 17 00:00:00 2001
  2. From: Matteo Croce <mcroce@redhat.com>
  3. Date: Thu, 29 Nov 2018 01:33:38 +0100
  4. Subject: [PATCH] Documentation: use RFC 5735 subnet for examples
  5.  
  6. RFC 5735 defines this subnets for documentation and example code:
  7.  
  8.   192.0.2.0/24 as TEST-NET-1
  9.   198.51.100.0/24 as TEST-NET-2
  10.   203.0.113.0/24 as TEST-NET-3
  11.  
  12. Replace where possible the IP addresses in the documentation with
  13. addresses belonging to the test subnets.
  14.  
  15. Signed-off-by: Matteo Croce <mcroce@redhat.com>
  16. ---
  17. Documentation/ABI/testing/sysfs-bus-rbd    | 2 +-
  18.  Documentation/admin-guide/LSM/Smack.rst    | 4 ++--
  19.  Documentation/dev-tools/kgdb.rst           | 2 +-
  20.  Documentation/filesystems/nfs/nfs-rdma.txt | 4 ++--
  21.  Documentation/isdn/README.HiSax            | 4 ++--
  22.  Documentation/networking/batman-adv.rst    | 6 +++---
  23.  Documentation/networking/cops.txt          | 2 +-
  24.  Documentation/networking/l2tp.txt          | 6 +++---
  25.  Documentation/networking/multiqueue.txt    | 4 ++--
  26.  Documentation/networking/net_failover.rst  | 2 +-
  27.  Documentation/networking/pktgen.txt        | 6 +++---
  28.  Documentation/networking/switchdev.txt     | 4 ++--
  29.  12 files changed, 23 insertions(+), 23 deletions(-)
  30.  
  31. diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd
  32. index cc30bee8b5f44..82e6a942c274c 100644
  33. --- a/Documentation/ABI/testing/sysfs-bus-rbd
  34. +++ b/Documentation/ABI/testing/sysfs-bus-rbd
  35. @@ -7,7 +7,7 @@ Description:
  36.  
  37.         Usage: <mon ip addr> <options> <pool name> <rbd image name> [<snap name>]
  38.  
  39. -        $ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add
  40. +        $ echo "192.0.2.1 name=admin rbd foo" > /sys/bus/rbd/add
  41.  
  42.         The snapshot name can be "-" or omitted to map the image
  43.         read/write. A <dev-id> will be assigned for any registered block
  44. diff --git a/Documentation/admin-guide/LSM/Smack.rst b/Documentation/admin-guide/LSM/Smack.rst
  45. index 6d44f4fdbf59f..a681e573de378 100644
  46. --- a/Documentation/admin-guide/LSM/Smack.rst
  47. +++ b/Documentation/admin-guide/LSM/Smack.rst
  48. @@ -723,11 +723,11 @@ If you don't know what CIPSO is and don't plan to use it, you can just do::
  49.     echo 127.0.0.1 -CIPSO > /sys/fs/smackfs/netlabel
  50.     echo 0.0.0.0/0 @      > /sys/fs/smackfs/netlabel
  51.  
  52. -If you use CIPSO on your 192.168.0.0/16 local network and need also unlabeled
  53. +If you use CIPSO on your 192.0.2.0/16 local network and need also unlabeled
  54.  Internet access, you can have::
  55.  
  56.     echo 127.0.0.1      -CIPSO > /sys/fs/smackfs/netlabel
  57. -   echo 192.168.0.0/16 -CIPSO > /sys/fs/smackfs/netlabel
  58. +   echo 192.0.2.0/16 -CIPSO > /sys/fs/smackfs/netlabel
  59.     echo 0.0.0.0/0      @      > /sys/fs/smackfs/netlabel
  60.  
  61.  Writing Applications for Smack
  62. diff --git a/Documentation/dev-tools/kgdb.rst b/Documentation/dev-tools/kgdb.rst
  63. index d38be58f872af..50a7641d13c12 100644
  64. --- a/Documentation/dev-tools/kgdb.rst
  65. +++ b/Documentation/dev-tools/kgdb.rst
  66. @@ -541,7 +541,7 @@ Connecting with gdb to a serial port
  67.     Example (kgdb to a terminal server on TCP port 2012)::
  68.  
  69.             % gdb ./vmlinux
  70. -           (gdb) target remote 192.168.2.2:2012
  71. +           (gdb) target remote 192.0.2.2:2012
  72.  
  73.  
  74.     Once connected, you can debug a kernel the way you would debug an
  75. diff --git a/Documentation/filesystems/nfs/nfs-rdma.txt b/Documentation/filesystems/nfs/nfs-rdma.txt
  76. index 22dc0dd6889cb..1adb29475d347 100644
  77. --- a/Documentation/filesystems/nfs/nfs-rdma.txt
  78. +++ b/Documentation/filesystems/nfs/nfs-rdma.txt
  79. @@ -214,8 +214,8 @@ NFS/RDMA Setup
  80.  
  81.      Exports entries with the following formats have been tested:
  82.  
  83. -    /vol0   192.168.0.47(fsid=0,rw,async,insecure,no_root_squash)
  84. -    /vol0   192.168.0.0/255.255.255.0(fsid=0,rw,async,insecure,no_root_squash)
  85. +    /vol0   192.0.2.47(fsid=0,rw,async,insecure,no_root_squash)
  86. +    /vol0   192.0.2.0/255.255.255.0(fsid=0,rw,async,insecure,no_root_squash)
  87.  
  88.      The IP address(es) is(are) the client's IPoIB address for an InfiniBand
  89.      HCA or the client's iWARP address(es) for an RNIC.
  90. diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
  91. index b1a573cf4472e..0c3a7e0ef80bf 100644
  92. --- a/Documentation/isdn/README.HiSax
  93. +++ b/Documentation/isdn/README.HiSax
  94. @@ -584,8 +584,8 @@ I4L_REMOTE_IS_CISCO=no
  95.  I4L_MODULE_PARAMS="type=16 io=0x268 irq=7 "
  96.  I4L_DEBUG=no
  97.  I4L_LEASED_128K=yes
  98. -LOCAL_IP=192.168.1.1
  99. -REMOTE_IP=192.168.2.1
  100. +LOCAL_IP=192.0.2.1
  101. +REMOTE_IP=198.51.100.1
  102.  
  103.  case "$1" in
  104.      start)
  105. diff --git a/Documentation/networking/batman-adv.rst b/Documentation/networking/batman-adv.rst
  106. index 245fb6c0ab6f5..7c9bfeed628fd 100644
  107. --- a/Documentation/networking/batman-adv.rst
  108. +++ b/Documentation/networking/batman-adv.rst
  109. @@ -118,11 +118,11 @@ IP address which can be either statically configured or dynamically (by using
  110.  DHCP or similar services)::
  111.  
  112.    NodeA: ip link set up dev bat0
  113. -  NodeA: ip addr add 192.168.0.1/24 dev bat0
  114. +  NodeA: ip addr add 192.0.2.1/24 dev bat0
  115.  
  116.    NodeB: ip link set up dev bat0
  117. -  NodeB: ip addr add 192.168.0.2/24 dev bat0
  118. -  NodeB: ping 192.168.0.1
  119. +  NodeB: ip addr add 192.0.2.2/24 dev bat0
  120. +  NodeB: ping 192.0.2.1
  121.  
  122.  Note: In order to avoid problems remove all IP addresses previously assigned to
  123.  interfaces now used by batman advanced, e.g.::
  124. diff --git a/Documentation/networking/cops.txt b/Documentation/networking/cops.txt
  125. index 3e344b448e07c..daa73cfbffc4d 100644
  126. --- a/Documentation/networking/cops.txt
  127. +++ b/Documentation/networking/cops.txt
  128. @@ -39,7 +39,7 @@ Or in lilo.conf put something like this:
  129.  
  130.  Then bring up the interface with ifconfig. It will look something like this:
  131.  lt0       Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-F7-00-00-00-00-00-00-00-00
  132. -          inet addr:192.168.1.2  Bcast:192.168.1.255  Mask:255.255.255.0
  133. +          inet addr:192.0.2.2  Bcast:192.0.2.255  Mask:255.255.255.0
  134.            UP BROADCAST RUNNING NOARP MULTICAST  MTU:600  Metric:1
  135.            RX packets:0 errors:0 dropped:0 overruns:0 frame:0
  136.            TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 coll:0
  137. diff --git a/Documentation/networking/l2tp.txt b/Documentation/networking/l2tp.txt
  138. index 9bc271cdc9a82..6d6cc03e08d02 100644
  139. --- a/Documentation/networking/l2tp.txt
  140. +++ b/Documentation/networking/l2tp.txt
  141. @@ -209,12 +209,12 @@ tunnels, where there is no L2TP control protocol; tunnels are
  142.  configured at each side manually. New commands are available in
  143.  iproute2's ip utility to support this.
  144.  
  145. -To create an L2TPv3 ethernet pseudowire between local host 192.168.1.1
  146. -and peer 192.168.1.2, using IP addresses 10.5.1.1 and 10.5.1.2 for the
  147. +To create an L2TPv3 ethernet pseudowire between local host 192.0.2.1
  148. +and peer 192.0.2.2, using IP addresses 10.5.1.1 and 10.5.1.2 for the
  149.  tunnel endpoints:-
  150.  
  151.  # ip l2tp add tunnel tunnel_id 1 peer_tunnel_id 1 udp_sport 5000 \
  152. -  udp_dport 5000 encap udp local 192.168.1.1 remote 192.168.1.2
  153. +  udp_dport 5000 encap udp local 192.0.2.1 remote 192.0.2.2
  154.  # ip l2tp add session tunnel_id 1 session_id 1 peer_session_id 1
  155.  # ip -s -d show dev l2tpeth0
  156.  # ip addr add 10.5.1.2/32 peer 10.5.1.1/32 dev l2tpeth0
  157. diff --git a/Documentation/networking/multiqueue.txt b/Documentation/networking/multiqueue.txt
  158. index 4caa0e314cc29..2d4488d7ada8f 100644
  159. --- a/Documentation/networking/multiqueue.txt
  160. +++ b/Documentation/networking/multiqueue.txt
  161. @@ -68,11 +68,11 @@ function or based on netdev->select_queue() if you have it defined.
  162.  
  163.  The behavior of tc filters remains the same.  However a new tc action,
  164.  skbedit, has been added.  Assuming you wanted to route all traffic to a
  165. -specific host, for example 192.168.0.3, through a specific queue you could use
  166. +specific host, for example 192.0.2.3, through a specific queue you could use
  167.  this action and establish a filter such as:
  168.  
  169.  tc filter add dev eth0 parent 1: protocol ip prio 1 u32 \
  170. -   match ip dst 192.168.0.3 \
  171. +   match ip dst 192.0.2.3 \
  172.     action skbedit queue_mapping 3
  173.  
  174.  Author: Alexander Duyck <alexander.h.duyck@intel.com>
  175. diff --git a/Documentation/networking/net_failover.rst b/Documentation/networking/net_failover.rst
  176. index 06c97dcb57cae..302ad3a0db4ca 100644
  177. --- a/Documentation/networking/net_failover.rst
  178. +++ b/Documentation/networking/net_failover.rst
  179. @@ -61,7 +61,7 @@ netdevs created in the VM.
  180.  
  181.    4: ens10: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
  182.        link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff
  183. -      inet 192.168.12.53/24 brd 192.168.12.255 scope global dynamic ens10
  184. +      inet 192.0.2.53/24 brd 192.0.2.255 scope global dynamic ens10
  185.           valid_lft 42482sec preferred_lft 42482sec
  186.        inet6 fe80::97d8:db2:8c10:b6d6/64 scope link
  187.           valid_lft forever preferred_lft forever
  188. diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt
  189. index d2fd78f85aa4f..eaed029ebf8ec 100644
  190. --- a/Documentation/networking/pktgen.txt
  191. +++ b/Documentation/networking/pktgen.txt
  192. @@ -91,7 +91,7 @@ interruption.  Example:
  193.       frags: 0  delay: 0  clone_skb: 64  ifname: eth4@0
  194.       flows: 0 flowlen: 0
  195.       queue_map_min: 0  queue_map_max: 0
  196. -     dst_min: 192.168.81.2  dst_max:
  197. +     dst_min: 192.0.2.2  dst_max:
  198.       src_min:   src_max:
  199.       src_mac: 90:e2:ba:0a:56:b4 dst_mac: 00:1b:21:3c:9d:f8
  200.       udp_src_min: 9  udp_src_max: 109  udp_dst_min: 9  udp_dst_max: 9
  201. @@ -101,7 +101,7 @@ interruption.  Example:
  202.       pkts-sofar: 100000  errors: 0
  203.       started: 623913381008us  stopped: 623913396439us idle: 25us
  204.       seq_num: 100001  cur_dst_mac_offset: 0  cur_src_mac_offset: 0
  205. -     cur_saddr: 192.168.8.3  cur_daddr: 192.168.81.2
  206. +     cur_saddr: 198.51.100.3  cur_daddr: 192.0.2.2
  207.       cur_udp_dst: 9  cur_udp_src: 42
  208.       cur_queue_map: 0
  209.       flows: 0
  210. @@ -233,7 +233,7 @@ samples/pktgen directory. The helper parameters.sh file support easy
  211.  and consistent parameter parsing across the sample scripts.
  212.  
  213.  Usage example and help:
  214. - ./pktgen_sample01_simple.sh -i eth4 -m 00:1B:21:3C:9D:F8 -d 192.168.8.2
  215. + ./pktgen_sample01_simple.sh -i eth4 -m 00:1B:21:3C:9D:F8 -d 198.51.100.2
  216.  
  217.  Usage: ./pktgen_sample01_simple.sh [-vx] -i ethX
  218.    -i : ($DEV)       output interface/device (required)
  219. diff --git a/Documentation/networking/switchdev.txt b/Documentation/networking/switchdev.txt
  220. index 86174ce8cd13a..cef7cb4bb6673 100644
  221. --- a/Documentation/networking/switchdev.txt
  222. +++ b/Documentation/networking/switchdev.txt
  223. @@ -340,7 +340,7 @@ Routes offloaded to the device are labeled with "offload" in the ip route
  224.  listing:
  225.  
  226.     $ ip route show
  227. -   default via 192.168.0.2 dev eth0
  228. +   default via 192.0.2.2 dev eth0
  229.     11.0.0.0/30 dev sw1p1  proto kernel  scope link  src 11.0.0.2 offload
  230.     11.0.0.4/30 via 11.0.0.1 dev sw1p1  proto zebra  metric 20 offload
  231.     11.0.0.8/30 dev sw1p2  proto kernel  scope link  src 11.0.0.10 offload
  232. @@ -350,7 +350,7 @@ listing:
  233.         nexthop via 11.0.0.9  dev sw1p2 weight 1
  234.     12.0.0.3 via 11.0.0.1 dev sw1p1  proto zebra  metric 20 offload
  235.     12.0.0.4 via 11.0.0.9 dev sw1p2  proto zebra  metric 20 offload
  236. -   192.168.0.0/24 dev eth0  proto kernel  scope link  src 192.168.0.15
  237. +   192.0.2.0/24 dev eth0  proto kernel  scope link  src 192.0.2.15
  238.  
  239.  The "offload" flag is set in case at least one device offloads the FIB entry.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement