Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/en/admintools.xml
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/en/admintools.xml	(revision 38947)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/en/admintools.xml	(working copy)
@@ -1343,7 +1343,7 @@
                 <action_name>Reset Now</action_name>
                 <verbose_name>Reset Log Settings</verbose_name>
                 <help_text/>
-                <confirm_msg>This action will also reset HTTP Logging, SLB Address Translation Logging, RFC5424 Logging and Email Alert settings. Are you sure you want to do this?</confirm_msg>
+                <confirm_msg>This action will also reset HTTP Logging, NAT Logging, RFC5424 Logging and Email Alert settings. Are you sure you want to do this?</confirm_msg>
                 <alert_msg/>
                 <process_title>Reset Log Settings</process_title>
                 <process_msg/>
@@ -1451,7 +1451,7 @@
       {
         &quot;fields&quot;: [
           {
-            &quot;verbose_name&quot;: &quot;SLB Address Translation&quot;,
+            &quot;verbose_name&quot;: &quot;NAT Logging&quot;,
             &quot;field_name&quot;: &quot;enable_lognat&quot;
           },
           {
@@ -1589,11 +1589,11 @@
                 </field>
             </fieldgrp>
             <fieldgrp name="slb_tran_logging_config">
-                <verbose_name>SLB Address Translation Logging Configuration</verbose_name>
+                <verbose_name>NAT Logging Configuration</verbose_name>
                 <help_text/>
                 <field name="enable_lognat" type="boolean">
-                    <verbose_name>SLB Address Translation</verbose_name>
-                    <help_text>Enables the system to generate SLB address translation logs according to the custom content format.</help_text>
+                    <verbose_name>NAT Logging</verbose_name>
+                    <help_text>Enables the system to generate NAT logs according to the custom content format.</help_text>
                 </field>
                 <field name="custom_content_format" type="string">
                     <verbose_name>Custom Content Format</verbose_name>
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/ja/admintools.xml
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/ja/admintools.xml	(revision 38947)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/ja/admintools.xml	(working copy)
@@ -1194,7 +1194,7 @@
                 <action_name>Reset Now</action_name>
                 <verbose_name>ログ設定のリセット</verbose_name>
                 <help_text/>
-                <confirm_msg>Reset log settings will also set HTTP Logging,SLB Address Translation Logging,RFC5424 Logging and Email Alert settings back to the default. Are you sure you want to do this?</confirm_msg>
+                <confirm_msg>Reset log settings will also set HTTP Logging, NAT Logging, RFC5424 Logging and Email Alert settings back to the default. Are you sure you want to do this?</confirm_msg>
                 <alert_msg/>
                 <process_title>Reset Log Settings</process_title>
                 <process_msg/>
@@ -1297,7 +1297,7 @@
                 <help_text/>
                 <field name="enable_lognat" type="boolean">
                     <verbose_name>SLBアドレス変換</verbose_name>
-                    <help_text>Enables the system to generate SLB address translation logs according to the custom content format.</help_text>
+                    <help_text>Enables the system to generate NAT logs according to the custom content format.</help_text>
                 </field>
                 <field name="custom_content_format" type="string">
                     <verbose_name>カスタムコンテンツフォーマット</verbose_name>
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/log_mgmt/__init__.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/log_mgmt/__init__.py	(revision 38947)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/log_mgmt/__init__.py	(working copy)
@@ -193,7 +193,7 @@
         verbose_name = 'Reset Log Settings'
         action_name = 'Reset Now'
         btn_class = 'btn-danger slow-action'
-        confirm_msg = "Reset log settings will also set HTTP Logging,SLB Address Translation Logging,RFC5424 Logging and Email Alert settings back to the default. Are you sure you want to do this?"
+        confirm_msg = "Reset log settings will also set HTTP Logging, SLB Address Translation Logging,RFC5424 Logging and Email Alert settings back to the default.. Are you sure you want to do this?"
         alert_msg = ""
         process_title = ""
         forever = False
@@ -338,8 +338,8 @@
         ), optional=True),
     })
 
-    slb_tran_logging_config = FieldGroup(writable=False, verbose_name='SLB Address Translation Logging Configuration', level=BASIC, editable=True, fields={
-      'enable_lognat': BooleanField(verbose_name='SLB Address Translation', lexical=('on','off')),                 
+    slb_tran_logging_config = FieldGroup(writable=False, verbose_name='NAT Logging Configuration', level=BASIC, editable=True, fields={
+      'enable_lognat': BooleanField(verbose_name='NAT Logging', lexical=('on','off')),                 
       'custom_content_format': CharField(verbose_name='Custom Content Format', length='0..64', condition=ValueCondition('enable_lognat', (True)), optional=True),
     })
 
@@ -487,4 +487,4 @@
             self.cli.set_config()
             result = self.cli.cmd('clear log rfc5424 msgid')
             mark_expire_all(RFC5424MSGIDEntry)
-            return result
\ No newline at end of file
+            return result
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/media/docs/rest/apv/admintools/log_mgmt/logadvanced.html
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/media/docs/rest/apv/admintools/log_mgmt/logadvanced.html	(revision 38947)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/media/docs/rest/apv/admintools/log_mgmt/logadvanced.html	(working copy)
@@ -122,7 +122,7 @@
                                                 <td>slb_tran_logging_config</td>
                                                 <td>enable_lognat</td>
                                                 <td>boolean</td>
-                                                <td>Enables the system to generate SLB address translation logs according to the custom content format.</td>
+                                                <td>Enables the system to generate NAT logs according to the custom content format.</td>
                                             </tr>
                                         
                                     
@@ -546,7 +546,7 @@
                                                 <td>slb_tran_logging_config</td>
                                                 <td>enable_lognat</td>
                                                 <td>boolean</td>
-                                                <td>Enables the system to generate SLB address translation logs according to the custom content format.</td>
+                                                <td>Enables the system to generate NAT logs according to the custom content format.</td>
                                             </tr>
                                         
                                     
@@ -887,7 +887,7 @@
                                             <tr>
                                                 <td>enable_lognat</td>
                                                 <td>boolean</td>
-                                                <td>Enables the system to generate SLB address translation logs according to the custom content format.</td>
+                                                <td>Enables the system to generate NAT logs according to the custom content format.</td>
                                             </tr>
                                             
                                         
@@ -1288,4 +1288,4 @@
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
Index: /branches/rel_apv_10_7/usr/src/sys/click/app/portfw/portfw.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/click/app/portfw/portfw.c	(revision 38947)
+++ /branches/rel_apv_10_7/usr/src/sys/click/app/portfw/portfw.c	(working copy)
@@ -286,6 +286,7 @@
 		return 0;
 	}
 
+	FASTLOG_SETUP_CONNECTION(CLICKTCP_SETUP_CONN_LOG, pcb, target);
 	pcb->cp_app = NULL;
 
 	/* Bug 22104, Adjust set CLICKPCB_SPLICE_NAT flag and call splice 
Index: /branches/rel_apv_10_7/usr/src/sys/click/netinet/click_input.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/click/netinet/click_input.c	(revision 38947)
+++ /branches/rel_apv_10_7/usr/src/sys/click/netinet/click_input.c	(working copy)
@@ -10614,6 +10614,7 @@
 				clicktcp_leave_func(int, 1);
 			}
 
+			FASTLOG_SETUP_CONNECTION(CLICKTCP_SETUP_CONN_LOG, client_pcb, server_pcb);
 			/* 
 			 * mss is not allowed to exceed the outgress if limit.
 			 * make sure that m and opt_addr have not been adjusted before here.
Index: /branches/rel_apv_10_7/usr/src/sys/click/netinet/click_udp.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/click/netinet/click_udp.c	(revision 38947)
+++ /branches/rel_apv_10_7/usr/src/sys/click/netinet/click_udp.c	(working copy)
@@ -807,6 +807,7 @@
 				sf_session_open(SF_APP_NAT_UDP, (clickpcb_t*)pcb, (clickpcb_t*)pcb->reverse);
 			}
 		}
+		FASTLOG_SETUP_CONNECTION(CLICKTCP_SETUP_CONN_LOG, (clickpcb_t *)pcb, (clickpcb_t *)pcb->reverse);
 		nat_tcpudp_log((clickpcb_t *)pcb, (clickpcb_t *)pcb->reverse);					
 		return CLICKUDP_RESULT_OURS;
 	}