Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 890

Show
Ignore:
Timestamp:
10/28/07 20:58:30 (11 months ago)
Author:
raphael
Message:

Fixed #824: IMAP SSL Traffic not counted (also added pop-ssl, https and mail delivery)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r888 r890  
    66|               * to fix: no errors on adding user (custom HP)    | 
    77\_________________________________________________________________/ 
     8 
     92007-10-28 Raphael Geissert 
     10    - ENGINE: 
     11        * Fixed #824: IMAP SSL Traffic not counted (also added pop-ssl, https and mail delivery) 
    812 
    9132007-10-27 Benedikt Heintel 

  • trunk/configs/init.d/ispcp_network

    r849 r890  
    9292        ${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 80 2>> "$LOGFILE" 
    9393 
     94        ${IPTABLES} -I ISPCP_INPUT -p tcp --dport 443 2>> "$LOGFILE" 
     95        ${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 443 2>> "$LOGFILE" 
     96 
    9497        # pop3 traffic 
    9598 
    …… 
    106109        ${IPTABLES} -I ISPCP_INPUT  -p tcp --dport 25 2>> "$LOGFILE" 
    107110        ${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 25 2>> "$LOGFILE" 
     111 
     112        ${IPTABLES} -I ISPCP_INPUT  -p tcp --dport 587 2>> "$LOGFILE" 
     113        ${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 587 2>> "$LOGFILE" 
     114 
     115        ${IPTABLES} -I ISPCP_INPUT  -p tcp --dport 995 2>> "$LOGFILE" 
     116        ${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 995 2>> "$LOGFILE" 
     117 
     118        ${IPTABLES} -I ISPCP_INPUT  -p tcp --dport 993 2>> "$LOGFILE" 
     119        ${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 993 2>> "$LOGFILE" 
    108120 
    109121        # Explicit return once done 
    …… 
    168180 
    169181        log_end_msg $? 
    170          
     182 
    171183        ;; 
    172184  status) 

  • trunk/engine/traffic/ispcp-srv-traff

    r765 r890  
    8888                domain_cgi 
    8989        FROM 
    90                 domain  
     90                domain 
    9191    "; 
    9292 
    …… 
    153153            $smtp_in = $bytes if ($port == 25); 
    154154 
     155            $smtp_in = $bytes if ($port == 587); 
     156 
    155157            $pop3_in = $bytes if ($port == 110); 
    156158 
     159            $pop3_in = $bytes if ($port == 995); 
     160 
    157161            $imap_in = $bytes if ($port == 143); 
    158162 
     163            $imap_in = $bytes if ($port == 993); 
     164 
    159165            $http_in = $bytes if ($port == 80); 
     166 
     167            $http_in = $bytes if ($port == 443); 
    160168 
    161169        } else {