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
|
package network::adsl;
use common;
use run_program;
use network::tools;
use network::ethernet;
use modules;
use Data::Dumper;
use vars qw(@ISA @EXPORT);
use MDK::Common::Globals "network", qw($in $prefix);
@ISA = qw(Exporter);
@EXPORT = qw(adsl_ask_info adsl_detect adsl_conf adsl_conf_backend);
sub configure {
my ($netcnx, $netc, $intf, $first_time) = @_;
$::isInstall and $in->set_help('configureNetworkADSL');
conf_adsl_step1:
# my $type = $in->ask_from_list_(N("Connect to the Internet"),
# N("The most common way to connect with adsl is pppoe.
# Some connections use pptp, a few ones use dhcp.
# If you don't know, choose 'use pppoe'"), [N_("use pppoe"), N_("use pptp"), N_("use dhcp"), N_("Alcatel speedtouch usb"), N_("ECI Hi-Focus")]) or return;
my $l = [ N_("use pppoe"),
N_("use pptp"),
N_("use dhcp"),
N_("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected"),
N_("Sagem (using pppoe) usb") . if_($netc->{autodetect}{adsl}{sagem}, " - detected"),
];
my $type = $in->ask_from_list_(N("Connect to the Internet"),
N("The most common way to connect with adsl is pppoe.
Some connections use pptp, a few ones use dhcp.
If you don't know, choose 'use pppoe'"), $l) or return;
$type =~ s/use //;
if ($type eq 'pppoe') {
$in->do_pkgs->install("rp-$type");
$netcnx->{type} = "adsl_$type";
# $netcnx->{"adsl_$type"} = {};
adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1;
#-network::configureNetwork($prefix, $netc, $in, $intf, $first_time);
# if ($::isStandalone and $netc->{NET_DEVICE}) {
# $in->ask_yesorno(N("Network interface"),
# N("I'm about to restart the network device %s. Do you agree?", $netc->{NET_DEVICE}), 1)
# and system("$prefix/sbin/ifdown $netc->{NET_DEVICE}; $prefix/sbin/ifup $netc->{NET_DEVICE}");
# }
}
#- use pppoe for Sagem modem, but NET_DEVICE is now ADIModem instead of ethx.
if ($type =~ /Sagem/) {
$in->do_pkgs->install(qw(rp-pppoe adiusbadsl));
$netcnx->{type} = "adsl_pppoe";
$netcnx->{adsl_pppoe} = {};
modules::add_alias('ADIModem', 'adiusbadsl');
$netc->{$_} = 'ADIModem' foreach qw(NET_DEVICE NET_INTERFACE);
adsl_conf($netcnx->{adsl_pppoe}, $netc, $intf, $type) or goto conf_adsl_step1;
}
if ($type eq 'dhcp') {
$in->do_pkgs->install(qw(dhcpcd));
go_ethernet($netc, $intf, 'dhcp', '', '', $first_time) or goto conf_adsl_step1;
}
if ($type eq 'pptp') {
$in->do_pkgs->install(qw(pptp-adsl));
$netcnx->{type} = "adsl_$type";
$netcnx->{"adsl_$type"} = {};
adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1;
}
if ($type =~ /speedtouch/) {
$type = 'speedtouch';
$in->do_pkgs->install(qw(speedtouch));
$netcnx->{type} = "adsl_$type";
$netcnx->{"adsl_$type"} = {};
$netcnx->{"adsl_$type"}{vpivci} = '';
adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1;
}
if ($type =~ /ECI/) {
$type = 'eci';
$in->do_pkgs->install(qw(eciadsl));
$netcnx->{type} = "adsl_$type";
$netcnx->{"adsl_$type"} = {};
$netcnx->{"adsl_$type"}{vpivci} = '';
adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1;
}
$type =~ /speedtouch|eci/ or $netconnect::need_restart_network = 1;
1;
}
sub adsl_ask_info {
my ($adsl, $netc, $_intf, $adsl_type) = @_;
my $pppoe_file = "/etc/ppp/pppoe.conf";
my $pppoe_conf = { getVarsFromSh($pppoe_file) } if $adsl_type =~ /pppoe/ && -f $pppoe_file;
$pppoe_conf->{DNS1} ||= '';
$pppoe_conf->{DNS2} ||= '';
add2hash($netc, { dnsServer2 => $pppoe_conf->{DNS1}, dnsServer3 => $pppoe_conf->{DNS2}, DOMAINNAME2 => '' });
add2hash($adsl, { login => $pppoe_conf->{USER}, passwd => '', passwd2 => '' });
ask_info2($adsl, $netc);
}
sub adsl_detect {
my ($adsl) = @_;
require detect_devices;
$adsl->{speedtouch} = detect_devices::getSpeedtouch();
$adsl->{sagem} = detect_devices::getSagem();
return $adsl if $adsl->{speedtouch} || $adsl->{sagem};
}
sub adsl_conf {
my ($adsl, $netc, $intf, $adsl_type) = @_;
adsl_conf_step_1:
adsl_ask_info($adsl, $netc, $intf, $adsl_type) or return;
adsl_conf_step_2:
$adsl_type =~ /speedtouch|eci/ or conf_network_card($netc, $intf, 'static', '10.0.0.10') or goto adsl_conf_step_1;
adsl_conf_backend($adsl, $netc, $adsl_type);
1;
}
sub adsl_conf_backend {
my ($adsl, $netc, $adsl_type, $netcnx) = @_;
defined $netcnx and $netc->{adsltype} = $netcnx->{type};
$netc->{adsltype} ||= "adsl_$adsl_type";
mkdir_p("$prefix/etc/ppp");
output("$prefix/etc/ppp/options",
'lock
noipdefault
persist
noauth
usepeerdns
defaultroute
') if $adsl_type =~ /pptp|pppoe|speedtouch|eci/;
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";
}
if ($adsl_type eq 'speedtouch') {
$netc->{vpivci} =~ /(\d+)_(\d+)/;
output("$prefix/etc/ppp/peers/adsl",
qq(noauth
noipdefault
pty "/usr/bin/pppoa3 -vpi $1 -vci $2"
sync
kdebug 1
noaccomp
nopcomp
noccp
novj
holdoff 4
maxfail 25
persist
usepeerdns
defaultroute
user "$adsl->{login}"
));
modules::add_alias($_->[0], $_->[1]) foreach ['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'];
$::isStandalone and modules::write_conf($prefix);
$in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->install('speedtouch_mgmt');
-e "$prefix/usr/share/speedtouch/mgmt.o" or $in->ask_warn('', N("You need the alcatel microcode.
Download it at
http://www.speedtouchdsl.com/dvrreg_lx.htm
and copy the mgmt.o in /usr/share/speedtouch"));
}
if ($adsl_type eq 'eci') {
$netc->{vpivci} =~ /(\d+)_(\d+)/;
output("$prefix/etc/ppp/peers/adsl",
qq(debug
kdebug 1
noipdefault
defaultroute
pty "/usr/bin/pppoeci -v 1 -vpi $1 -vci $2"
sync
noaccomp
nopcomp
noccp
novj
holdoff 10
user "$adsl->{login}"
linkname eciadsl
maxfail 10
usepeerdns
noauth
lcp-echo-interval 0
));
modules::add_alias($_->[0], $_->[1]) foreach ['char-major-108', 'ppp_generic'],
['tty-ldisc-14', 'ppp_synctty'],
['tty-ldisc-13', 'n_hdlc'];
$::isStandalone and modules::write_conf($prefix);
}
if ($adsl_type eq 'pptp') {
write_cnx_script($netc, "adsl",
"/sbin/route del default
/usr/bin/pptp 10.0.0.138 name $adsl->{login}
",
'/usr/bin/killall pptp pppd
', $netc->{adsltype}) } elsif ($adsl_type eq 'pppoe') {
write_cnx_script($netc, "adsl",
"/sbin/route del default
LC_ALL=C LANG=C LANGUAGE=C LC_MESSAGES=C /usr/sbin/adsl-start $netc->{NET_DEVICE} $adsl->{login}
",
'/usr/sbin/adsl-stop
/usr/bin/killall pppoe pppd
', $netc->{adsltype}) } elsif ($adsl_type eq 'speedtouch') {
write_cnx_script($netc, 'adsl',
'/sbin/route del default
/usr/share/speedtouch/speedtouch.sh start
',
'/usr/share/speedtouch/speedtouch.sh stop
', $netc->{adsltype}) } elsif ($adsl_type eq 'eci') {
write_cnx_script($netc, 'adsl',
'/sbin/route del default
/usr/bin/startmodem
',
"# et pour le stop on se touche c'est du beta...
echo 'not yet implemented, still beta software'
", $netc->{adsltype}) }
$netc->{NET_INTERFACE} = 'ppp0';
}
1;
|
