From: Arne Fitzenreiter Date: Sat, 20 Sep 2008 22:27:27 +0000 (+0200) Subject: Add additional AT-Commands to ppp settings. (eg. for GPRS/UMTS init) X-Git-Tag: v2.3-beta4~35 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=789047d0be334c14b313acf3f634686eedbf98f7 Add additional AT-Commands to ppp settings. (eg. for GPRS/UMTS init) --- diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index f9744b0088..f09e3724a6 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -616,6 +616,18 @@ END + + $Lang::tr{'optional at cmd'} 1 * + + + + $Lang::tr{'optional at cmd'} 2 * + + + + $Lang::tr{'optional at cmd'} 3 * + + $Lang::tr{'send cr'} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index fb6d405e85..b47f5ba916 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -4,6 +4,7 @@ 'Act as' => 'Konfiguriert als', 'Add Port Rule' => 'Port Regel hinzufügen', 'Add Rule' => 'Regel hinzufügen', +'optional at cmd' => 'zusätzlicher Modembefehl', 'Choose Rule' => 'Waehlen sie eine der untenstehenden Regeln aus.', 'Class' => 'Klasse', 'Class was deleted' => 'wurde mit eventuell vorhandenen Unterklassen geloescht', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0262678762..fd05793585 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -4,6 +4,7 @@ 'Act as' => 'Act as:', 'Add Port Rule' => 'Add port rule', 'Add Rule' => 'Add Rule', +'optional at cmd' => 'optional AT command', 'Choose Rule' => 'Choose one of the following rules.', 'Class' => 'Class', 'Class was deleted' => 'with potential Subclasses was deleted', diff --git a/src/ppp/dialer b/src/ppp/dialer index 21118b1470..95ceef4fb9 100644 --- a/src/ppp/dialer +++ b/src/ppp/dialer @@ -10,7 +10,7 @@ # use strict; -require 'CONFIG_ROOT/general-functions.pl'; +require '/var/ipfire/general-functions.pl'; my %pppsettings; my %modemsettings; @@ -56,6 +56,22 @@ if ($pppsettings{'SENDCR'} eq 'off') { else { $btfudge = ''; } + +my ($add_at1, $add_at2, $add_at3); + +if ($pppsettings{'ADD_AT1'} eq '') { + $add_at1 = 'AT'; } +else { + $add_at1 = $pppsettings{'ADD_AT1'}; } +if ($pppsettings{'ADD_AT2'} eq '') { + $add_at2 = 'AT'; } +else { + $add_at2 = $pppsettings{'ADD_AT2'}; } +if ($pppsettings{'ADD_AT3'} eq '') { + $add_at3 = 'AT'; } +else { + $add_at3 = $pppsettings{'ADD_AT3'}; } + unlink('/var/log/connect.log'); my $com = "/usr/sbin/chat -v -r /var/log/connect.log \ @@ -68,6 +84,9 @@ my $com = "/usr/sbin/chat -v -r /var/log/connect.log \ '' '$modemsettings{'INIT'}' \ OK '$modemsettings{'HANGUP'}' \ OK '$speaker' \ + OK '$add_at1' \ + OK '$add_at2' \ + OK '$add_at3' \ TIMEOUT '$modemsettings{'TIMEOUT'}' \ OK '${dial}${telephone}' \ CONNECT '${btfudge}' ";