Ver.1.5.34 Fixed CLang warning and others

diff --git a/opengate/README b/opengate/README
index d2db166..82c3dcd 100644 (file)
--- a/opengate/README
+++ b/opengate/README
@@ -18,8 +18,13 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-Email: watanaby@is.saga-u.ac.jp
-support page: http://www.cc.saga-u.ac.jp/opengate/index-e.html
+Email:
+ watanaby@is.saga-u.ac.jp
+ watanaby@users.osdn.jp
+support page: 
+ http://www.cc.saga-u.ac.jp/opengate/index-e.html
+ http://opengate.osdn.jp/index.html.en
+
 
 -----------------------------------------------------
 install documentation is in doc
@@ -37,13 +42,6 @@ conf/                Configuration files
 doc/           Documentation files
   Changes.html         Change log
   GPL.txt              GNU General Public License
-  progflow.html                Program flow
-  protocol.txt         Protocol between related applications
-
-  en/ & ja/ documentation for each language
-   install.html                Instruction for installation 
-   qa.html             Questions and answers(not up to date)
-   errcheck.html       Error checking list(not up to date)
  
 javahtml/      Client Java Applet and HTML files
   index.html.var       Document selector placed in DocumentRoot

diff --git a/opengate/conf/opengatesrv.conf.sample b/opengate/conf/opengatesrv.conf.sample
index 3fed7d5..aa736da 100644 (file)
--- a/opengate/conf/opengatesrv.conf.sample
+++ b/opengate/conf/opengatesrv.conf.sample
@@ -7,7 +7,7 @@
        <!-- #########################################################
             ## Opengate gateway server hostname(FQDN or IP address)## -->
 
-       <OpengateServerName>opengate.og.saga-u.ac.jp</OpengateServerName>
+       <OpengateServerName>opengate.example.com</OpengateServerName>
 
        <!-- #######################################################
             ## Authentication servers (can set multiple servers) ##

diff --git a/opengate/conf/rc.firewall.sample b/opengate/conf/rc.firewall.sample
index 339bf53..c729622 100644 (file)
--- a/opengate/conf/rc.firewall.sample
+++ b/opengate/conf/rc.firewall.sample
@@ -29,14 +29,8 @@ $fwcmd add deny all from ${inet}:${imask} to any in via ${oif}
 $fwcmd add deny all from ${onet}:${omask} to any in via ${iif}
 
 ### Allow from / to myself
-$fwcmd add pass all from ${iip} to any via ${iif}
-$fwcmd add pass all from ${oip} to any via ${oif}
-$fwcmd add pass all from any to ${iip} via ${iif}
-$fwcmd add pass all from any to ${oip} via ${oif}
-$fwcmd add pass all from ${iip6} to any via ${iif}
-$fwcmd add pass all from ${oip6} to any via ${oif}
-$fwcmd add pass all from any to ${iip6} via ${iif}
-$fwcmd add pass all from any to ${oip6} via ${oif}
+$fwcmd add pass all from me to any
+$fwcmd add pass all from any to me
 
 ### Allow DNS queries out in the world
 ### (if DNS is on localhost, delete passDNS)
@@ -56,16 +50,20 @@ $fwcmd add pass udp from fe80::/10 521 to ff02::9 521
 $fwcmd add pass udp from fe80::/10 521 to fe80::/10 521
 
 ############Taggged rules############################
-## Opengate add following rules after authentication
-##   count tag <TagNo> ip from any to <ClientAddr>
-##   count tag <TagNo> ip from <ClientAddr> to any
-## <TagNo> : IpfwTagNumber in opengatesrv.conf
-## <ClientAddr> :IP address of authenticated client
+## Opengate add following rules after authentication (at Layer2 check)
+## (Need 'net.link.ether.ipfw=1' in /etc/sysctl.conf to enable L2 check)
+##   count tag 123 ip from any to any MAC any <CliMac> keep-state via ..
+##   count tag 123 ip from any to any MAC <CliMac> any keep-state via ..
+## 123 : Can be set as IpfwTagNumber of opengatesrv.conf
+## <CliMac> :MAC address of authenticated client
 
 $fwcmd add 60000 allow ip from any to any tagged 123
 
 ################################################
 
+## At L2 check, throw all packets to L3 check after tagged
+$fwcmd add 60010 pass ip from any to any MAC any any
+
 ### Forwarding IPv4 http connection from unauth client 
 $fwcmd add 60100 fwd localhost tcp from ${inet}:${imask} to any 80
 $fwcmd add 60100 fwd localhost tcp from ${inet}:${imask} to any 443

diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index 18c448b..a0c4318 100644 (file)
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -777,6 +777,11 @@ Opengate History</H3>
        Added checking of null language string.
        Changed strncpy/strncat to strlcpy/strlcat.
        </DD>
+       <DT>
+       Ver.1.5.34 at 2015.6.10
+       </DT><DD>
+       Fixed CLang warning messages. Modified ipfw rules.Moved some documents to Web. 
+       </DD>
        </DL>
 <P>
 <B>Please see CVS on SourceForge.net to check the differences between

diff --git a/opengate/ezxml/Makefile b/opengate/ezxml/Makefile
index c8a99fc..ba39f66 100644 (file)
--- a/opengate/ezxml/Makefile
+++ b/opengate/ezxml/Makefile
@@ -21,7 +21,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-CC = gcc
+# CC = gcc
 AR = ar
 RM = rm -f
 CFLAGS = -Wall -O2
@@ -59,4 +59,4 @@ ezxml.o: ezxml.h ezxml.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-       $(RM) $(OBJS) $(LIB) $(TEST) *~
\ No newline at end of file
+       $(RM) $(OBJS) $(LIB) $(TEST) *~

diff --git a/opengate/ezxml/ezxml.c b/opengate/ezxml/ezxml.c
index 82b11fb..73fedae 100644 (file)
--- a/opengate/ezxml/ezxml.c
+++ b/opengate/ezxml/ezxml.c
@@ -361,7 +361,7 @@ short ezxml_internal_dtd(ezxml_root_t root, char *s, size_t len)
             else *s = '\0'; // null terminate tag name
             for (i = 0; root->attr[i] && strcmp(n, root->attr[i][0]); i++);
 
-            while (*(n = ++s + strspn(s, EZXML_WS)) && *n != '>') {
+            while (++s, *(n = s + strspn(s, EZXML_WS)) && *n != '>') {
                 if (*(s = n + strcspn(n, EZXML_WS))) *s = '\0'; // attr name
                 else { ezxml_err(root, t, "malformed <!ATTLIST"); break; }
 

diff --git a/opengate/javahtml/en/httpkeep.html b/opengate/javahtml/en/httpkeep.html
index 745e82c..947b7e1 100644 (file)
--- a/opengate/javahtml/en/httpkeep.html
+++ b/opengate/javahtml/en/httpkeep.html
@@ -84,5 +84,9 @@ the network can be used for that duration of time.</p>
 
 <div id="debug">
 
+<h3>If you want to register this device, please click 
+<a href="https://opengate.example.com/cgi-bin/opengate/opengatemown.cgi?lang=%%LANGUAGE%%&redirectedurl=%%REDIRECTEDURL%%">
+here.</a></h3>
+
 </body>
 </html>

diff --git a/opengate/javahtml/ja/httpkeep.html b/opengate/javahtml/ja/httpkeep.html
index 093c26e..1f15006 100644 (file)
--- a/opengate/javahtml/ja/httpkeep.html
+++ b/opengate/javahtml/ja/httpkeep.html
@@ -86,5 +86,8 @@ class="button"><br>
 
 <div id="debug">
 
+<h3>この端末を利用許可登録したいならば、
+<a href="https://opengate.example.com/cgi-bin/opengate/opengatemown.cgi?lang=%%LANGUAGE%%&redirectedurl=%%REDIRECTEDURL%%">ここ</a>
+をクリックしてください。</h3>
 </body>
 </html>

diff --git a/opengate/opengatesrv/Makefile b/opengate/opengatesrv/Makefile
index 6a49302..d9eb978 100644 (file)
--- a/opengate/opengatesrv/Makefile
+++ b/opengate/opengatesrv/Makefile
@@ -2,7 +2,7 @@
 ##  must be matched to descriptions in html files ########
 ##  some other parameters exist in opengatesrv.h  ########
 ##########################################################
-WWWTOP = /usr/local/www/apache22
+WWWTOP = /usr/local/www/apache24
 DOCDIR = /data
 CGIDIR = /cgi-bin
 OPENGATEDIR = /opengate
@@ -14,7 +14,7 @@ INSTALLDOCPATH = ${WWWTOP}${DOCDIR}${OPENGATEDIR}
 INSTALLCGIPATH = ${WWWTOP}${CGIDIR}${OPENGATEDIR}
 MAKEDIR != pwd
 
-CFLAGS= -g -O4 -Wall -I/usr/local/include
+CFLAGS= -g -O3 -Wall -I/usr/local/include
 
 .if exists(/usr/local/include/ldap.h)
 LIBLDAP = -lldap -llber

diff --git a/opengate/opengatesrv/auth-ftps.c b/opengate/opengatesrv/auth-ftps.c
index 1df4726..96d4ce3 100644 (file)
--- a/opengate/opengatesrv/auth-ftps.c
+++ b/opengate/opengatesrv/auth-ftps.c
@@ -43,7 +43,7 @@ int authFtpse(char *userid, char *passwd)
   char* port;      /* auth server port */
   SSL_CTX    *ctx;
   SSL        *ssl;
-  SSL_METHOD *meth;
+  const SSL_METHOD *meth;
 
   /* get auth server address */
   serverAddr=GetConfValue("AuthServer/Address");
@@ -192,7 +192,7 @@ int authFtpsi(char *userid, char *passwd)
   char* port;      /* auth server port */
   SSL_CTX    *ctx;
   SSL        *ssl;
-  SSL_METHOD *meth;
+  const SSL_METHOD *meth;
 
   /* get auth server address */
   serverAddr=GetConfValue("AuthServer/Address");

diff --git a/opengate/opengatesrv/auth-pop3s.c b/opengate/opengatesrv/auth-pop3s.c
index 7a5dd36..13b6841 100644 (file)
--- a/opengate/opengatesrv/auth-pop3s.c
+++ b/opengate/opengatesrv/auth-pop3s.c
@@ -42,7 +42,7 @@ int authPop3s(char *userid, char *passwd)
   int           authResult;
   SSL_CTX    *ctx;
   SSL        *ssl;
-  SSL_METHOD *meth;
+  const SSL_METHOD *meth;
 
   /* get auth server address */
   serverAddr=GetConfValue("AuthServer/Address");

diff --git a/opengate/opengatesrv/comm-cgi.c b/opengate/opengatesrv/comm-cgi.c
index ab53543..0c10fdb 100644 (file)
--- a/opengate/opengatesrv/comm-cgi.c
+++ b/opengate/opengatesrv/comm-cgi.c
@@ -347,7 +347,7 @@ void putClientDeny(char *clientAddr4, char *language)
           GetConfValue("AuthCgi"));
 
   /* create opengate dir */
-  snprintf(opengateDir, BUFFMAXLN, GetConfValue("OpengateDir"));
+  snprintf(opengateDir, BUFFMAXLN, "%s", GetConfValue("OpengateDir"));
 
   /* create encoded addr4 */
   if(AddrEncode(encodeAddr, clientAddr4)==1){
@@ -403,7 +403,7 @@ void putClientRetry(char *language)
     };
 
   /* create opengate Dir */
-  snprintf(opengateDir, BUFFMAXLN, GetConfValue("OpengateDir"));
+  snprintf(opengateDir, BUFFMAXLN, "%s", GetConfValue("OpengateDir"));
  
   /* create external URL string */
   strlcpy(externalUrl, GetConfValue("ExternalUrl"), BUFFMAXLN);

diff --git a/opengate/opengatesrv/error.c b/opengate/opengatesrv/error.c
index 50b5551..10fd72d 100644 (file)
--- a/opengate/opengatesrv/error.c
+++ b/opengate/opengatesrv/error.c
@@ -111,7 +111,7 @@ err_doit(int errnoflag, int level, const char *fmt, va_list ap)
        strcat(buf, "\n");
 
        if (daemon_proc) {
-               syslog(level, buf);
+               syslog(level, "%s", buf);
        } else {
                fflush(stdout);         /* in case stdout and stderr are the same */
                fputs(buf, stderr);

diff --git a/opengate/opengatesrv/opengateauth.c b/opengate/opengatesrv/opengateauth.c
index 939b430..2800de7 100644 (file)
--- a/opengate/opengatesrv/opengateauth.c
+++ b/opengate/opengatesrv/opengateauth.c
@@ -86,8 +86,8 @@ int  main(int argc, char **argv)
 
   if(debug>1) err_msg("DEBUG: started");
 
-  snprintf(opengateServerName,BUFFMAXLN,GetConfValue("OpengateServerName"));
-  snprintf(opengateDir,BUFFMAXLN,GetConfValue("OpengateDir"));
+  snprintf(opengateServerName,BUFFMAXLN,"%s",GetConfValue("OpengateServerName"));
+  snprintf(opengateDir,BUFFMAXLN,"%s",GetConfValue("OpengateDir"));
 
   /* create URL string */
   snprintf(authCgiUrl, BUFFMAXLN, "%s%s%s/%s",

diff --git a/opengate/opengatesrv/utilities.c b/opengate/opengatesrv/utilities.c
index 616e146..100a325 100644 (file)
--- a/opengate/opengatesrv/utilities.c
+++ b/opengate/opengatesrv/utilities.c
@@ -362,7 +362,7 @@ void createCookie(char *cookie)
   char str[BUFFMAXLN];
 
   /* make Http-cookie from pid&time */
-  snprintf(str, BUFFMAXLN, "%d%d", getpid(),time(NULL));
+  snprintf(str, BUFFMAXLN, "%d%ld", getpid(),time(NULL));
   md5hex(cookie, SIDMAXLN, str);
 }