14 files changed, 177 insertions, 36 deletions
diff --git a/recipes-core/multitech/config/ppp/peers/gsm b/recipes-core/multitech/config/ppp/peers/gsm
index d23957e..c456764 100644
--- a/recipes-core/multitech/config/ppp/peers/gsm
+++ b/recipes-core/multitech/config/ppp/peers/gsm
@@ -8,4 +8,4 @@ ipcp-restart 10
 noauth
 crtscts
 novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/gsm_chat'
+connect '/usr/libexec/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/gsm_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/gsm_chat b/recipes-core/multitech/config/ppp/peers/gsm_chat
index 5e18e05..a92c938 100644
--- a/recipes-core/multitech/config/ppp/peers/gsm_chat
+++ b/recipes-core/multitech/config/ppp/peers/gsm_chat
@@ -12,11 +12,32 @@ OK 'ATZ'
 OK 'AT+CSQ'
 # ----------------------------------
 # Set the APN for your provider here
+# Note that a comment starting with
+# #MT AT+CGDCONT=
+# will be interpretted by
+# /usr/libexec/chat_wrapper
+# as the intended context
+# setting.  Make the context number
+# (after the =) match the
+# dialer number context.
+# If the context changes, chat_wrapper
+# handles disconnecting the modem
+# from the network during the update,
+# which is required
+# by some modem firmware.
+# The chat script will be executed
+# after the chat_wrapper script
+# re-registers the modem.
+# The context will only be set if the
+# modem settings do not match the
+# settings here.
+# Lines starting with # MT are ignored.
 # ----------------------------------
-#OK 'AT+CGDCONT=1,"IP","proxy"'
-#OK 'AT+CGDCONT=1,"IP","ISP.CINGULAR"'
-#OK 'AT+CGDCONT=1,"IP","internet2.voicestream.com"'
-OK 'AT+CGDCONT=1,"IP","internet"'
+# MT AT+CGDCONT=1,"IP","proxy"
+# MT AT+CGDCONT=1,"IP","ISP.CINGULAR"
+# MT AT+CGDCONT=1,"IP","internet2.voicestream.com"
+#MT AT+CGDCONT=1,"IP","internet"
+OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 #OK 'ATD*99#'
 OK 'ATD*99***1#'
diff --git a/recipes-core/multitech/config/ppp/peers/l4e1 b/recipes-core/multitech/config/ppp/peers/l4e1
index d6359cd..2996e6e 100644
--- a/recipes-core/multitech/config/ppp/peers/l4e1
+++ b/recipes-core/multitech/config/ppp/peers/l4e1
@@ -8,4 +8,4 @@ ipcp-restart 10
 noauth
 crtscts
 novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4e1_chat'
+connect '/usr/libexec/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4e1_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/l4e1_chat b/recipes-core/multitech/config/ppp/peers/l4e1_chat
index 3a297ed..6b6be44 100644
--- a/recipes-core/multitech/config/ppp/peers/l4e1_chat
+++ b/recipes-core/multitech/config/ppp/peers/l4e1_chat
@@ -12,10 +12,28 @@ OK 'ATZ'
 OK 'AT+CSQ'
 # ----------------------------------
 # Set the APN for your provider here
+# Note that a comment starting with
+# #MT AT+CGDCONT=
+# will be interpretted by
+# /usr/libexec/chat_wrapper
+# as the intended context
+# setting.  Make the context number
+# (after the =) match the
+# dialer number context.
+# If the context changes, chat_wrapper
+# handles disconnecting the modem
+# from the network during the update,
+# which is required
+# by some modem firmware.
+# The chat script will be executed
+# after the chat_wrapper script
+# re-registers the modem.
+# The context will only be set if the
+# modem settings do not match the
+# settings here.
+# Lines starting with # MT are ignored.
 # ----------------------------------
-OK 'AT+COPS=2'
-OK 'AT+CGDCONT=1,"IP","internet"'
-OK 'AT+COPS=0'
+#MT AT+CGDCONT=1,"IP","internet"
 OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 OK 'ATD*99***1#'
diff --git a/recipes-core/multitech/config/ppp/peers/l4n1 b/recipes-core/multitech/config/ppp/peers/l4n1
index c0b4beb..2e0b501 100644
--- a/recipes-core/multitech/config/ppp/peers/l4n1
+++ b/recipes-core/multitech/config/ppp/peers/l4n1
@@ -8,4 +8,4 @@ ipcp-restart 10
 noauth
 crtscts
 novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4n1_chat'
+connect '/usr/libexec/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4n1_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz b/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz
index ea5907e..64a05be 100644
--- a/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz
+++ b/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz
@@ -31,15 +31,34 @@ ABORT 'BUSY'
 '' 'AT'
 OK 'ATZ'
 OK 'AT+CSQ'
-#-------------------------------------------
-# Set the non-Verizon APN on the next line
-#-------------------------------------------
-#OK 'AT+CGDCONT=3,"IP","proxy"'
-#OK 'AT+CGDCONT=3,"IP","ISP.CINGULAR"'
-#OK 'AT+CGDCONT=3,"IP","internet2.voicestream.com"'
-OK 'AT+COPS=2'
-OK 'AT+CGDCONT=3,"IP","phone"'
-OK 'AT+COPS=0'
+# ----------------------------------
+# Set the APN for your provider here
+# Note that a comment starting with
+# #MT AT+CGDCONT=
+# will be interpretted by
+# /usr/libexec/chat_wrapper
+# as the intended context
+# setting.  Make the context number
+# (after the =) match the
+# dialer number context.
+# If the context changes, chat_wrapper
+# handles disconnecting the modem
+# from the network during the update,
+# which is required
+# by some modem firmware.
+# The chat script will be executed
+# after the chat_wrapper script
+# re-registers the modem.
+# The context will only be set if the
+# modem settings do not match the
+# settings here.
+# Lines starting with # MT are ignored.
+# ----------------------------------
+# MT AT+CGDCONT=3,"IP","proxy"
+# MT AT+CGDCONT=3,"IP","ISP.CINGULAR"
+# MT AT+CGDCONT=3,"IP","internet2.voicestream.com"
+#MT AT+CGDCONT=3,"IP","phone"
+OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 OK 'ATD*99***3#'
 SAY "Waiting for CONNECT...\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lap3 b/recipes-core/multitech/config/ppp/peers/lap3
index bac08a1..9b56aae 100644
--- a/recipes-core/multitech/config/ppp/peers/lap3
+++ b/recipes-core/multitech/config/ppp/peers/lap3
@@ -8,4 +8,4 @@ ipcp-restart 10
 noauth
 crtscts
 novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lap3_chat'
+connect '/usr/libexec/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lap3_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/lap3_chat b/recipes-core/multitech/config/ppp/peers/lap3_chat
index bc5ebcf..92a5e54 100644
--- a/recipes-core/multitech/config/ppp/peers/lap3_chat
+++ b/recipes-core/multitech/config/ppp/peers/lap3_chat
@@ -1,4 +1,4 @@
-SAY "LSP3 chat\n"
+SAY "LAP3 chat\n"
 ECHO OFF
 ABORT 'NO DIAL TONE'
 ABORT 'NO DIALTONE'
@@ -10,6 +10,30 @@ ABORT 'BUSY'
 '' 'AT'
 OK 'ATZ'
 OK 'AT+CSQ'
+# ----------------------------------
+# Set the APN for your provider here
+# Note that a comment starting with
+# #MT AT+CGDCONT=
+# will be interpretted by
+# /usr/libexec/chat_wrapper
+# as the intended context
+# setting.  Make the context number
+# (after the =) match the
+# dialer number context.
+# If the context changes, chat_wrapper
+# handles disconnecting the modem
+# from the network during the update,
+# which is required
+# by some modem firmware.
+# The chat script will be executed
+# after the chat_wrapper script
+# re-registers the modem.
+# The context will only be set if the
+# modem settings do not match the
+# settings here.
+# Lines starting with # MT are ignored.
+# ----------------------------------
+#MT AT+CGDCONT=1,"IP","internet"
 OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 OK 'ATD*99***1#'
diff --git a/recipes-core/multitech/config/ppp/peers/leu1 b/recipes-core/multitech/config/ppp/peers/leu1
index 993b33a..2e247b3 100644
--- a/recipes-core/multitech/config/ppp/peers/leu1
+++ b/recipes-core/multitech/config/ppp/peers/leu1
@@ -8,4 +8,4 @@ ipcp-restart 10
 noauth
 crtscts
 novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/leu1_chat'
+connect '/usr/libexec/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/leu1_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/leu1_chat b/recipes-core/multitech/config/ppp/peers/leu1_chat
index 23faf0e..817f75d 100644
--- a/recipes-core/multitech/config/ppp/peers/leu1_chat
+++ b/recipes-core/multitech/config/ppp/peers/leu1_chat
@@ -12,8 +12,29 @@ OK 'ATZ'
 OK 'AT+CSQ'
 # ----------------------------------
 # Set the APN for your provider here
+# Note that a comment starting with
+# #MT AT+CGDCONT=
+# will be interpretted by
+# /usr/libexec/chat_wrapper
+# as the intended context
+# setting.  Make the context number
+# (after the =) match the
+# dialer number context.
+# If the context changes, chat_wrapper
+# handles disconnecting the modem
+# from the network during the update,
+# which is required
+# by some modem firmware.
+# The chat script will be executed
+# after the chat_wrapper script
+# re-registers the modem.
+# The context will only be set if the
+# modem settings do not match the
+# settings here.
+# Lines starting with # MT are ignored.
 # ----------------------------------
-OK 'AT+CGDCONT=1,"IP","internet"'
+#MT AT+CGDCONT=1,"IP","internet"
+OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 OK 'ATD*99***1#'
 SAY "Waiting for CONNECT...\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lna3 b/recipes-core/multitech/config/ppp/peers/lna3
index bd84569..022e4fc 100644
--- a/recipes-core/multitech/config/ppp/peers/lna3
+++ b/recipes-core/multitech/config/ppp/peers/lna3
@@ -8,4 +8,4 @@ ipcp-restart 10
 noauth
 crtscts
 novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lna3_chat'
+connect '/usr/libexec/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lna3_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz
index 033efde..33fd377 100644
--- a/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz
+++ b/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz
@@ -31,14 +31,34 @@ ABORT 'BUSY'
 '' 'AT'
 OK 'ATZ'
 OK 'AT+CSQ'
-#-------------------------------------------
-# Set the non-Verizon APN on the next line
-#-------------------------------------------
-#OK 'AT+CGDCONT=3,"IP","proxy"'
-#OK 'AT+CGDCONT=3,"IP","ISP.CINGULAR"'
-#OK 'AT+CGDCONT=3,"IP","internet2.voicestream.com"'
-OK 'AT+COPS=2'
-OK 'AT+CGDCONT=3,"IP","phone"'
+# ----------------------------------
+# Set the APN for your provider here
+# Note that a comment starting with
+# #MT AT+CGDCONT=
+# will be interpretted by
+# /usr/libexec/chat_wrapper
+# as the intended context
+# setting.  Make the context number
+# (after the =) match the
+# dialer number context.
+# If the context changes, chat_wrapper
+# handles disconnecting the modem
+# from the network during the update,
+# which is required
+# by some modem firmware.
+# The chat script will be executed
+# after the chat_wrapper script
+# re-registers the modem.
+# The context will only be set if the
+# modem settings do not match the
+# settings here.
+# Lines starting with # MT are ignored.
+# ----------------------------------
+# MT AT+CGDCONT=3,"IP","proxy"
+# MT AT+CGDCONT=3,"IP","ISP.CINGULAR"
+# MT AT+CGDCONT=3,"IP","internet2.voicestream.com"
+#MT AT+CGDCONT=3,"IP","phone"
+OK 'AT+CGDCONT?'
 OK 'AT+COPS=0'
 SAY "Dialing...\n"
 OK 'ATD*99***3#'
diff --git a/recipes-core/multitech/config/ppp/peers/lsp3 b/recipes-core/multitech/config/ppp/peers/lsp3
index 072477b..4a3da2f 100644
--- a/recipes-core/multitech/config/ppp/peers/lsp3
+++ b/recipes-core/multitech/config/ppp/peers/lsp3
@@ -8,4 +8,4 @@ ipcp-restart 10
 noauth
 crtscts
 novj
-connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lsp3_chat'
+connect '/usr/libexec/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lsp3_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/lsp3_chat b/recipes-core/multitech/config/ppp/peers/lsp3_chat
index 347c3b8..529a260 100644
--- a/recipes-core/multitech/config/ppp/peers/lsp3_chat
+++ b/recipes-core/multitech/config/ppp/peers/lsp3_chat
@@ -12,10 +12,28 @@ OK 'ATZ'
 OK 'AT+CSQ'
 # ----------------------------------
 # Set the APN for your provider here
+# Note that a comment starting with
+# #MT AT+CGDCONT=
+# will be interpretted by
+# /usr/libexec/chat_wrapper
+# as the intended context
+# setting.  Make the context number
+# (after the =) match the
+# dialer number context.
+# If the context changes, chat_wrapper
+# handles disconnecting the modem
+# from the network during the update,
+# which is required
+# by some modem firmware.
+# The chat script will be executed
+# after the chat_wrapper script
+# re-registers the modem.
+# The context will only be set if the
+# modem settings do not match the
+# settings here.
+# Lines starting with # MT are ignored.
 # ----------------------------------
-OK 'AT+COPS=2'
-OK 'AT+CGDCONT=1,"IP","internet"'
-OK 'AT+COPS=0'
+#MT AT+CGDCONT=1,"IP","internet"
 OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 OK 'ATD*99***2#'