[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

docs/network/ipsec/index.xml: 1.4 -> 1.5



以下のページの更新をしました。ツッコミをお願いします。

docs/network/ipsec/index.xml: 1.4 -> 1.5
> revision 1.5
> date: 2009/01/15 09:50:23;  author: hubertf;  state: Exp;  lines: +12 -4
> Put processing diagrams into own subsection, and split them imto
> two separate diagrams.
> 
> XXX someone know if the contents are still OK?

金曜日までに異議がなければ、 commit します。

以下、訳と原文それぞれの新旧の差分です。

--- docs/network/ipsec/index.xml.orig	2009-01-15 21:55:52.000000000 +0900
+++ docs/network/ipsec/index.xml	2009-01-15 21:55:52.000000000 +0900
@@ -5,10 +5,10 @@
 
 <webpage id="ja-docs-network-ipsec-index">
   <config param="desc" value="NetBSD IPsec FAQ"/>
-  <config param="cvstag" value="$NetBSD: index.xml,v 1.4 2008/02/15 00:52:19 hubertf Exp $"/>
+  <config param="cvstag" value="$NetBSD: index.xml,v 1.5 2009/01/15 09:50:23 hubertf Exp $"/>
   <!-- Based on english version: -->
-  <!-- NetBSD: index.xml,v 1.4 2008/02/15 00:52:19 hubertf Exp   -->
-  <config param="rcsdate" value="$Date: 2008/02/15 00:52:19 $"/>
+  <!-- NetBSD: index.xml,v 1.5 2009/01/15 09:50:23 hubertf Exp   -->
+  <config param="rcsdate" value="$Date: 2009/01/15 09:50:23 $"/>
 
   <head>
     <!-- Copyright (c) 1994-2006
@@ -627,8 +627,12 @@
 	    使って見分けるようにする必要があるかもしれません。
 	  </listitem>
 	</itemizedlist>
+      </sect3>
+
+      <sect3 id="procorder">
+	<title>処理順序</title>
 
-	<para>下記の図は、新しい処理順序をまとめたものです。</para>
+	<para>下記の図は、受信側の新しい処理順序をまとめたものです。</para>
 
 	<programlisting>
 入ってくる場合の処理:
@@ -644,12 +648,16 @@
   v       ^          ^                      |
 tunnel    |          +----------------------+ decapsulated IPsec packets
 devices   |
-  |     ipfilter rules
+  |     ipfilter rule
   |       ^
   +------>|
           |
         Network drivers (ethernet)
+</programlisting>
+
+	<para>下記の図は、送信側の新しい処理順序をまとめたものです。</para>
 
+	<programlisting>
 出てゆく場合の処理:
         userland programs               IKE daemon
             | AF_INET{,6} socket          ^ | PF_KEY socket
Index: docs/network/ipsec/index.xml
===================================================================
RCS file: /cvsroot/htdocs/docs/network/ipsec/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- docs/network/ipsec/index.xml	15 Feb 2008 00:52:19 -0000	1.4
+++ docs/network/ipsec/index.xml	15 Jan 2009 09:50:23 -0000	1.5
@@ -5,8 +5,8 @@
 
 <webpage id="docs-network-ipsec-index">
   <config param="desc" value="NetBSD IPsec FAQ"/>
-  <config param="cvstag" value="$NetBSD: index.xml,v 1.4 2008/02/15 00:52:19 hubertf Exp $"/>
-  <config param="rcsdate" value="$Date: 2008/02/15 00:52:19 $"/>
+  <config param="cvstag" value="$NetBSD: index.xml,v 1.5 2009/01/15 09:50:23 hubertf Exp $"/>
+  <config param="rcsdate" value="$Date: 2009/01/15 09:50:23 $"/>
 
   <head>
     <!-- Copyright (c) 1994-2006
@@ -644,8 +644,12 @@
 	    in &man.ipf.conf.5;.
 	  </listitem>
 	</itemizedlist>
+      </sect3>
+
+      <sect3 id="procorder">
+	<title>Processing order</title>
 
-	<para>The following diagram summarizes new processing order.</para>
+	<para>The following diagram summarizes new inbound processing order:</para>
 
 	<programlisting>
 inbound processing:
@@ -661,12 +665,16 @@
   v       ^          ^                      |
 tunnel    |          +----------------------+ decapsulated IPsec packets
 devices   |
-  |     ipfilter rules
+  |     ipfilter rule
   |       ^
   +------>|
           |
         Network drivers (ethernet)
+</programlisting>
+
+	<para>The following diagram summarizes new outbound processing order:</para>
 
+	<programlisting>
 outbound processing:
         userland programs               IKE daemon
             | AF_INET{,6} socket          ^ | PF_KEY socket