1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
|
package network::adsl; # $Id$
use common;
use run_program;
use network::tools;
use network::ethernet;
use modules;
use vars qw(@ISA @EXPORT);
@ISA = qw(Exporter);
@EXPORT = qw(adsl_conf_backend);
sub get_wizard {
my ($wiz) = @_;
my $netc = $wiz->{var}{netc};
my %l = (
'pppoe' => N("use pppoe"),
'pptp' => N("use pptp"),
'dhcp' => N("use dhcp"),
'speedtouch' => N("Alcatel Speedtouch USB") . if_($netc->{autodetect}{adsl}{speedtouch}, N(" - detected")),
'sagem' => N("Sagem (using PPPOA) USB") . if_($netc->{autodetect}{adsl}{sagem}, N(" - detected")),
'sagem_dhcp' => N("Sagem (using DHCP) USB") . if_($netc->{autodetect}{adsl}{sagem}, N(" - detected")),
# 'eci' => N("ECI Hi-Focus"), # this one needs eci agreement
);
$wiz->{var}{adsl} = {
connection_list => \%l,
type => "",
};
add2hash($wiz->{pages},
{
adsl_old => {
name => N("Connect to the Internet") . "\n\n" .
N("The most common way to connect with adsl is pppoe.
Some connections use pptp, a few use dhcp.
If you don't know, choose 'use pppoe'"),
data => [
{
label => N("ADSL connection type :"), val => \$wiz->{var}{adsl}{type}, list => [ sort values %l ] },
],
pre => sub {
$wiz->{var}{adsl}{type} = $l{sagem}; # debug
$wiz->{var}{adsl}{type} ||= find { $netc->{autodetect}{adsl}{$_} } keys %l;
print "\n\ntype is «$wiz->{var}{adsl}{type}»\n\n";
},
post => sub {
$wiz->{var}{adsl}{type} = find { $l{$_} eq $wiz->{var}{adsl}{type} } keys %l;
my $adsl = $wiz->{var}{adsl}{connection};
my $type = $wiz->{var}{adsl}{type};
my $netcnx = $wiz->{var}{netcnx};
$netcnx->{type} = "adsl_$type";
$netcnx->{"adsl_$type"} = {};
$netcnx->{"adsl_$type"}{vpivci} = '' if $type =~ /eci|speedtouch/;
return 'ethernet' if $type eq 'dhcp';
adsl_probe_info($adsl, $netc, $type);
# my ($adsl, $netc, $intf, $adsl_type) = @_;
# ask_info2($adsl, $netc);
return "hw_account";
},
},
});
};
sub adsl_probe_info {
my ($adsl, $netc, $adsl_type, $o_adsl_modem) = @_;
my $pppoe_file = "$::prefix/etc/ppp/pppoe.conf";
my $pptp_file = "$::prefix/etc/sysconfig/network-scripts/net_cnx_up";
my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if (! defined $adsl_type || $adsl_type eq 'pppoe') && -f $pppoe_file;
my $login = $pppoe_conf{USER};
foreach (qw(/etc/ppp/peers/ppp0 /etc/ppp/options /etc/ppp/options.adsl)) {
($login) = map { if_(/^user\s+"([^"]+)"/, $1) } cat_("$::prefix/$_") if !$login && -r "$::prefix/$_";
}
($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if (! defined $adsl_type || $adsl_type eq 'pptp') && -r $pptp_file;
my $passwd = passwd_by_login($login);
if (!$netc->{vpi} && !$netc->{vpi} && member($o_adsl_modem, qw(eci speedtouch))) {
($netc->{vpi}, $netc->{vci}) =
(map { if_(/^.*-vpi\s+(\d+)\s+-vci\s+(\d+)/, map { sprintf("%x", $_) } $1, $2) } cat_("$::prefix/etc/ppp/peers/ppp0"));
}
$pppoe_conf{DNS1} ||= '';
$pppoe_conf{DNS2} ||= '';
add2hash($netc, { dnsServer2 => $pppoe_conf{DNS1}, dnsServer3 => $pppoe_conf{DNS2}, DOMAINNAME2 => '' });
add2hash($adsl, { login => $login, passwd => $passwd, passwd2 => '' });
}
sub adsl_detect() {
my $adsl = {};
require detect_devices;
($adsl->{bewan}) = detect_devices::getBewan();
($adsl->{speedtouch}) = detect_devices::getSpeedtouch();
($adsl->{sagem}) = detect_devices::getSagem();
($adsl->{eci}) = detect_devices::getECI();
return $adsl;
}
sub adsl_conf_backend {
my ($in, $adsl, $netc, $adsl_device, $adsl_type, $o_netcnx) = @_;
# FIXME: should not be needed:
defined $o_netcnx and $netc->{adsltype} = $o_netcnx->{type};
$netc->{adsltype} ||= "adsl_$adsl_type";
$adsl_type eq 'pptp' and $adsl_device = 'pptp_modem';
my $bewan_module;
$bewan_module = $o_netcnx->{bus} eq 'PCI' ? 'unicorn_pci_atm' : 'unicorn_usb_atm' if $adsl_device eq "bewan";
# all supported modems came with their own pppoa module, so no need for "plugin pppoatm.so"
my %modems = (
bewan => {
start => qq(
modprobe pppoatm
# ActivationMode=1
modprobe $bewan_module
# wait for the modem to be set up:
sleep 10
),
stop => qq(modprobe -r $bewan_module),
pppd_options => "plugin pppoatm.so $netc->{vpi}." . hex($netc->{vci}),
ppp_options => qq(
lock
ipparam ppp0
default-asyncmap
hide-password
noaccomp
nobsdcomp
nodeflate
novj novjccomp
lcp-echo-interval 20
lcp-echo-failure 3
mtu 1200
mru 1200
sync
),
},
speedtouch =>
{
start => '/usr/sbin/modem_run -k -n 2 -f /usr/share/speedtouch/mgmt.o',
overide_script => 1,
server => {
pppoa => '"/usr/sbin/pppoa3 -e 1 -c"
plugin pppoatm.so
' . join('.', hex($netc->{vpi}), hex($netc->{vci})),
},
ppp_options => qq(
sync
noaccomp),
aliases => [
['char-major-108', 'ppp_generic'],
['tty-ldisc-3', 'ppp_async'],
['tty-ldisc-13', 'n_hdlc'],
['tty-ldisc-14', 'ppp_synctty'],
['ppp-compress-21', 'bsd_comp'],
['ppp-compress-24', 'ppp_deflate'],
['ppp-compress-26', 'ppp_deflate']
],
},
sagem =>
{
start => "/usr/sbin/eaglectrl -w",
stop => "/usr/bin/killall pppoa",
get_intf => "/usr/sbin/eaglectrl -i",
server => {
pppoa => qq("/usr/sbin/pppoa -I `/usr/sbin/eaglectrl -s; /usr/sbin/eaglectrl -i`"),
},
ppp_options => qq(
mru 1492
mtu 1492
nobsdcomp
nodeflate
noaccomp -am
novjccomp),
aliases => [
['char-major-108', 'ppp_generic'],
['tty-ldisc-14', 'ppp_synctty'],
['tty-ldisc-13', 'n_hdlc']
],
},
eci =>
{
start => '/usr/bin/startmodem',
server => {
pppoe => qq("/usr/bin/pppoeci -v 1 -vpi $netc->{vpi} -vci $netc->{vci}"),
},
ppp_options => qq(
noipdefault
sync
noaccomp
linkname eciadsl
noauth
lcp-echo-interval 0)
},
pptp_modem =>
{
server => {
pptp => qq("/usr/sbin/pptp 10.0.0.138 --nolaunchpppd"),
},
},
);
if ($adsl_type =~ /^pp/) {
mkdir_p("$::prefix/etc/ppp");
$in->do_pkgs->install('ppp') if !$>;
my %packages = (
pppoa => [ qw(ppp-pppoatm) ],
pppoe => [ qw(ppp-pppoe rp-pppoe) ],
pptp => [ qw(pptp-linux) ],
);
$in->do_pkgs->install(@{$packages{$adsl_type}}) if !$>;
output("$::prefix/etc/ppp/options",
$adsl_device eq "bewan" ?
qq(lock
ipparam ppp0
noipdefault
noauth
default-asyncmap
defaultroute
hide-password
noaccomp
noccp
nobsdcomp
nodeflate
nopcomp
novj novjccomp
lcp-echo-interval 20
lcp-echo-failure 3
mtu 1200
mru 1200
sync
persist
user $adsl->{login}
name $adsl->{login}
usepeerdns
)
:
qq(lock
noipdefault
persist
noauth
usepeerdns
defaultroute)
);
output("$::prefix/etc/ppp/peers/ppp0",
qq(noauth
noipdefault
$modems{$adsl_device}{ppp_options}
kdebug 1
nopcomp
noccp
novj
holdoff 4
maxfail 25
persist
usepeerdns
defaultroute
pty $modems{$adsl_device}{server}{$adsl_type}
user "$adsl->{login}"
));
write_secret_backend($adsl->{login}, $adsl->{passwd});
if ($adsl_type eq 'pppoe') {
substInFile {
s/ETH=.*\n/ETH=$netc->{NET_DEVICE}\n/;
s/USER=.*\n/USER=$adsl->{login}\n/;
s/DNS1=.*\n/DNS1=$netc->{dnsServer2}\n/;
s/DNS2=.*\n/DNS2=$netc->{dnsServer3}\n/;
} "$::prefix/etc/ppp/pppoe.conf";
}
# pptp => {
# connect => "/usr/bin/pptp 10.0.0.138 name $adsl->{login}",
# disconnect => "/usr/bin/killall pptp pppd\n",
# },
# pppoe => {
# # we do not call directly pppd, rp-pppoe take care of "plugin rp-pppoe.so" peers option and the like
# connect => "LC_ALL=C LANG=C LANGUAGE=C LC_MESSAGES=C /usr/sbin/adsl-start",
# disconnect => qq(/usr/sbin/adsl-stop
# /usr/bin/killall pppoe pppd\n),
# },
}
#- FIXME:
#- ppp0 and ippp0 are hardcoded
#- pptp has to be done within pppd (no more use of /usr/bin/pptp)
my $kind = $adsl_type eq 'pppoe' ? 'xDSL' : 'ADSL';
output_with_perm("$::prefix/etc/sysconfig/network-scripts/ifcfg-ppp0", 0705, qq(DEVICE=ppp0
ONBOOT=no
TYPE=$kind
));
# sagem specific stuff
if ($adsl_device eq 'sagem') {
my %l = map { $_ => sprintf("%08s", $netc->{$_}) } qw(vci vpi Encapsulation);
# set vpi and vci parameters for sagem
foreach my $cfg_file (qw(/etc/analog/adiusbadsl.conf /etc/eagle-usb/eagle-usb.conf)) {
substInFile {
s/VCI=.*\n/VCI=$l{vci}\n/;
s/VPI=.*\n/VPI=$l{vpi}\n/;
s/Encapsulation=.*\n/Encapsulation=$l{Encapsulation}\n/;
} "$::prefix$cfg_file";
}
}
# set aliases:
if (exists $modems{$adsl_device}{aliases}) {
modules::add_alias($_->[0], $_->[1]) foreach @{$modems{$adsl_device}{aliases}};
$::isStandalone and modules::write_conf();
}
$netc->{NET_INTERFACE} = 'ppp0';
write_cnx_script($netc);
}
1;
|
