提交: 23813d2c8272de9ce7c0c38854a04bf07256ce24 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• 修訂: 23813d2c8272de9ce7c0c38854a04bf07256ce24 (tree)
• 時間: 2013-11-29 16:29:20
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

Merge branch 'master' of file:///var/www/html/ultramonkey-l7-v3.git

Conflicts:
README
doc/man/l7directord.8
doc/man/l7vsadm.8
l7directord/Makefile.am
l7directord/l7directord
l7vsd/init.d/Makefile.am
l7vsd/module/protocol/protocol_module_ip.cpp
l7vsd/module/protocol/protocol_module_sessionless.cpp
l7vsd/src/l7vsd.cpp
l7vsd/src/session_thread_control.cpp
l7vsd/src/virtualservice_tcp.cpp
ultramonkeyl7.spec

Signed-off-by: Hiroaki Nakano <[e-mail]>

Change Summary

• modified: README
• modified: doc/man/l7directord.8
• modified: doc/man/l7vsadm.8
• modified: l7directord/Makefile.am
• modified: l7directord/l7directord
• modified: l7vsd/init.d/Makefile.am
• modified: l7vsd/module/protocol/protocol_module_ip.cpp
• modified: l7vsd/module/protocol/protocol_module_sessionless.cpp
• modified: ultramonkeyl7.spec

差異

--- a/README
+++ b/README
@@ -14,7 +14,7 @@ System requirements
 
           CPU : Intel x86 and x86_64 or compatible architecture processors
 
-       Memory : 2 GB(recommended)
+       Memory : 4 GB(recommended)
 
     Libraries : log4cxx(C++ Logging Libraries) boost(C++ Template Libraries)
     

--- a/doc/man/l7directord.8
+++ b/doc/man/l7directord.8
@@ -327,13 +327,11 @@ check if a server is alive. They override the request-receive pair in the
 virtual server section. These two strings must be quoted. If the request
 string starts with \fIhttp://...\fR the IP-address and port of the real server
 is overridden, otherwise the IP-address and port of the real server is used.
-.IP "\fBmodule =\fR \fIproto-module module-args [opt\-module\-args]\fR" 4
-.IX Item "module = proto-module module-args [opt-module-args]"
+.IP "\fBmodule =\fR \fIproto-module [opt\-module\-args]\fR" 4
+.IX Item "module = proto-module [opt-module-args]"
 Indicates the module parameter of \fBl7directord\fR. Here \fBproto-module\fR
-denotes the protocol module name (For example, pfilter). \fBmodule-args\fR denotes the
-arguments for the protocol module (For example, \-\-pattern\-match '*.html*').
-\&\fBmodule-args\fR is optional only when set \fBsessionless\fR, \fBip\fR and \fBsslid\fR module to \fBproto-module\fR.
-The last argument is optional (For example, \-\-reschedule).
+denotes the protocol module name (For example, sessionless).
+The last argument \&\fBopt-module-args\fR is optional (For example, \-\-reschedule).
 .Sh "More than one of these entries may be inside a virtual section:"
 .IX Subsection "More than one of these entries may be inside a virtual section:"
 .IP "\fBmaxconn =\fR \fIn\fR" 4

--- a/doc/man/l7vsadm.8
+++ b/doc/man/l7vsadm.8
@@ -145,7 +145,7 @@ Create the TCP service.
 Specify the protocol module.
 
 .br
-\fIproto\-module\fR := { url | sslid | sessionless | pfilter | ip }
+\fIproto\-module\fR := { sslid | sessionless | ip }
 
 .br 
 \fImodule\-args\fR := see the operation manual.

--- a/l7directord/Makefile.am
+++ b/l7directord/Makefile.am
@@ -4,5 +4,5 @@ SBINDIR = @sbindir@
 
 install:
 	$(INSTALL) -m 755 -D ./l7directord $(SBINDIR)/l7directord
-	$(INSTALL) -m 755 -D ./init.d/l7directord ${sysconfdir}/init.d/l7directord
+	$(INSTALL) -m 755 -D ./init.d/l7directord ${sysconfdir}/rc.d/init.d/l7directord
 

--- a/l7directord/l7directord
+++ b/l7directord/l7directord
@@ -4745,13 +4745,11 @@ virtual server section. These two strings must be quoted. If the request
 string starts with I<http://...> the IP-address and port of the real server
 is overridden, otherwise the IP-address and port of the real server is used.
 
-=item B<module => I<proto-module module-args [opt-module-args]>
+=item B<module => I<proto-module [opt-module-args]>
 
 Indicates the module parameter of B<l7directord>. Here B<proto-module>
-denotes the protocol module name (For example, pfilter). B<module-args> denotes the
-arguments for the protocol module (For example, --pattern-match '*.html*').
-B<module-args> is optional only when set B<sessionless>, B<ip> and B<sslid> module to B<proto-module>.
-The last argument is optional (For example, --reschedule).
+denotes the protocol module name (For example, sessionless).
+The last argument B<opt-module-args> is optional (For example, --reschedule).
 
 =back
 

--- a/l7vsd/init.d/Makefile.am
+++ b/l7vsd/init.d/Makefile.am
@@ -1,4 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
 
 install:
-	$(INSTALL) -m 755 -D ./l7vsd ${sysconfdir}/init.d/l7vsd
+	$(INSTALL) -m 755 -D ./l7vsd ${sysconfdir}/rc.d/init.d/l7vsd

--- a/l7vsd/module/protocol/protocol_module_ip.cpp
+++ b/l7vsd/module/protocol/protocol_module_ip.cpp
@@ -446,6 +446,12 @@ protocol_module_base::check_message_result protocol_module_ip::check_parameter(c
                                         break;
                                 }
                         }
+                        //option string = "-F"
+                        else if (*it == "-F" || *it == "--forwarded-for") {
+                                //set forward flag ON
+                                ++it;
+                                continue;
+                        }
                         //option string = "-S"
                         else if (*it == "-S" || *it == "--sorry-uri") {
                                 //set sorryURI flag OFF

--- a/l7vsd/module/protocol/protocol_module_sessionless.cpp
+++ b/l7vsd/module/protocol/protocol_module_sessionless.cpp
@@ -404,8 +404,13 @@ protocol_module_base::check_message_result protocol_module_sessionless::check_pa
                 vec_str_it it_end = args.end();
                 //loop option strings
                 for (; it != it_end; ++it) {
+                        //option string = "-F"
+                        if (*it == "-F" || *it == "--forwarded-for") {
+                                //set forward flag ON
+                                continue;
+                        }
                         //option string = "-S"
-                        if (*it == "-S" || *it == "--sorry-uri") {
+                        else if (*it == "-S" || *it == "--sorry-uri") {
                                 //set sorryURI flag OFF
                                 if (!sorryuri_checked) {
                                         //next item exist

--- a/ultramonkeyl7.spec
+++ b/ultramonkeyl7.spec
@@ -1,4 +1,4 @@
-%define l7vs_moddir	%{_libdir}/l7vs
+Name:		%define l7vs_moddir	%{_libdir}/l7vs
 %define l7vs_logdir	%{_localstatedir}/log/l7vs
 %define l7vs_includedir %{_includedir}/l7vs
 %define l7vsadm_sockdir	%{_localstatedir}/run/l7vs
@@ -7,7 +7,7 @@
 Summary: The Layer-7 Virtual Server
 Name: ultramonkeyl7
 Version: 3.1.0
-Release: devel%{?dist}
+Release: 1%{?dist}
 License: LGPLv2.1
 Group: System Environment/Daemons
 URL: http://sourceforge.jp/projects/ultramonkey-l7/
@@ -96,7 +96,7 @@ fi
 %defattr(-, root, root, 0755)
 %{_sbindir}/*
 %{l7vs_moddir}/*
-%{_sysconfdir}/init.d/*
+%{_sysconfdir}/rc.d/init.d/*
 %dir %{l7vs_moddir}
 %dir %{l7vs_logdir}
 %dir %{_sysconfdir}/l7vs
@@ -163,3 +163,45 @@ fi
 
 * Thu Aug  6 2009 TATEISHI Katsuyuki <[e-mail]> 2.1.2-2atfix
 - rpmlint free
+
+Version:	
+Release:	1%{?dist}
+Summary:	
+
+Group:		
+License:	
+URL:		
+Source0:	
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	
+Requires:	
+
+%description
+
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc
+
+
+
+%changelog