Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

[people/teissler/ipfire-2.x.git] / src / ppp / dialer

diff --git a/src/ppp/dialer b/src/ppp/dialer
index d1dba0ac1109d91966e4834ce421fe979df01620..c8aad46e7c8cb2583d65ac3bf05e5351476160f6 100644 (file)
--- a/src/ppp/dialer
+++ b/src/ppp/dialer
@@ -19,9 +19,9 @@ my %modemsettings;
 &General::readhash("${General::swroot}/modem/settings", \%modemsettings);
 
 if ($modemsettings{'INIT'} eq '') {
-       $modemsettings{'INIT'} = 'AT'; }
+       $modemsettings{'INIT'} = '+++ATZ'; }
 if ($modemsettings{'HANGUP'} eq '') {
-       $modemsettings{'HANGUP'} = 'AT'; }
+       $modemsettings{'HANGUP'} = 'ATH'; }
 if ($modemsettings{'SPEAKER_ON'} eq '') {
        $modemsettings{'SPEAKER_ON'} = 'AT'; }
 if ($modemsettings{'SPEAKER_OFF'} eq '') {
@@ -82,13 +82,15 @@ my $com = "/usr/sbin/chat -v -r /var/log/connect.log                        \
        ABORT                   '\\nRINGING\\r\\n\\r\\nRINGING\\r'      \
        ABORT                   '\\nNO CARRIER\\r'                      \
        ''                      '$modemsettings{'INIT'}'                \
-       OK                      '$add_at1'                              \
-       ''                      '$modemsettings{'HANGUP'}'              \
+       ''                      '$add_at1'                              \
+       ''                      '$modemsettings{'INIT'}'                \
+       OK                      '$modemsettings{'HANGUP'}'              \
        OK                      '$speaker'                              \
        OK                      '$add_at2'                              \
        ''                      '$add_at3'                              \
+       ''                      'sleep 5'                               \
        TIMEOUT                 '$modemsettings{'TIMEOUT'}'             \
-       OK                      '${dial}${telephone}'                   \
+       OK                      '\d${dial}${telephone}'                 \
        CONNECT                 '${btfudge}'                            ";
 
 if ($loginscript)