/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-chilli_ip.patch
ViewVC logotype

Annotation of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-chilli_ip.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.3 - (hide annotations) (download)
Tue Nov 25 16:20:19 2008 UTC (15 years, 11 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-coova-chilli-0_2-14_el4_sme, smeserver-coova-chilli-0_2-7_el4_sme, smeserver-coova-chilli-0_2-17_el4_sme, smeserver-coova-chilli-0_2-10_el4_sme, smeserver-coova-chilli-0_2-16_el4_sme, smeserver-coova-chilli-0_2-13_el4_sme, smeserver-coova-chilli-0_2-19_el4_sme, smeserver-coova-chilli-0_2-12_el4_sme, smeserver-coova-chilli-0_2-18_el4_sme, smeserver-coova-chilli-0_2-8_el4_sme, smeserver-coova-chilli-0_2-9_el4_sme, smeserver-coova-chilli-0_2-20_el4_sme, smeserver-coova-chilli-0_2-15_el4_sme, HEAD
Changes since 1.2: +0 -0 lines
Restore

1 vip-ire 1.1 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/25listen.chilli_ip 2008-09-02 13:28:00.000000000 +0200
2     +++ smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/25listen 2008-09-05 12:00:55.000000000 +0200
3     @@ -1,16 +1,8 @@
4     {
5     # Compute the first IP of the network
6     -my $net = $chilli{'net'} || '10.1.0.0/255.255.255.0';
7     -my @net = split(/\//,$net);
8     -$net = $net[0];
9     -my @nums = split(/\./,$net);
10     -my $i = 0;
11     -my $chillip = '';
12     -foreach (@nums){
13     - $chillip .= $_."." if ($i ne '3');
14     - $chillip .= "1" if ($i eq '3');
15     - $i++;
16     -}
17     +our $net = $chilli{'net'} || '10.1.0.0/255.255.255.0';
18     +our chillip = NetAddr::IP->new($net) + 1;
19     +$chillip = $net->addr;
20    
21     $OUT = "uamlisten $chillip\n";
22    
23     --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/00setup.chilli_ip 2008-09-05 11:58:45.000000000 +0200
24     +++ smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/00setup 2008-09-05 11:59:00.000000000 +0200
25     @@ -0,0 +1,3 @@
26     +{
27     +use NetAddr::IP;
28     +}
29     --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/55uamserver.chilli_ip 2008-09-02 13:36:44.000000000 +0200
30     +++ smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/chilli.conf/55uamserver 2008-09-05 12:01:30.000000000 +0200
31     @@ -1,16 +1,4 @@
32     {
33     -# Compute the first IP of the network
34     -my $net = $chilli{'net'} || '10.1.0.0/255.255.255.0';
35     -my @net = split(/\//,$net);
36     -$net = $net[0];
37     -my @nums = split(/\./,$net);
38     -my $i = 0;
39     -my $chillip = '';
40     -foreach (@nums){
41     - $chillip .= $_."." if ($i ne '3');
42     - $chillip .= "1" if ($i eq '3');
43     - $i++;
44     -}
45    
46     my $uamsecret = $chilli{'uamsecret'} || 'azerty';
47    
48     --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/squid/squid.conf/15HTTPPortChilli.chilli_ip 2008-09-02 13:28:01.000000000 +0200
49     +++ smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/squid/squid.conf/15HTTPPortChilli 2008-09-05 12:02:47.000000000 +0200
50     @@ -1,18 +1,11 @@
51     {
52     +use NetAddr::IP;
53     +my $net = $chilli{'net'} || '10.1.0.0/255.255.255.0';
54     +my chillip = NetAddr::IP->new($net) + 1;
55     +$chillip = $net->addr;
56     +
57     $OUT ='';
58     if ($chilli{'status'} eq 'enabled'){
59     - # Compute the first IP of the network
60     - my $net = $chilli{'net'} || '10.1.0.0/255.255.255.0';
61     - my @net = split(/\//,$net);
62     - $net = $net[0];
63     - my @nums = split(/\./,$net);
64     - my $i = 0;
65     - my $chillip = '';
66     - foreach (@nums){
67     - $chillip .= $_."." if ($i ne '3');
68     - $chillip .= "1" if ($i eq '3');
69     - $i++;
70     - }
71     my $squidport = $squid{'TransparentPort'} || '3128';
72     $OUT = "http_port $chillip:$squidport\n";
73     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed