- New protocols for GSM/HSCSD connections: v110async and v120async

Thanks to: Uwe Fest <ufest@mudal.de>

pppdcapiplugin/capiplugin.8

@@ -320,12 +320,12 @@ See option \fIdialmax\fR.
 phone number to dial to access an outside line. For example, \fInumberprefix 0\fR.
 
 .TP
-.B protocol \fIhdlc\fR | \fIx75\fR | \fIv42bis\fR | \fImodem\fR | \fIadslpppoe\fR
+.B protocol \fIhdlc\fR | \fIx75\fR | \fIv42bis\fR | \fImodem\fR | \fIadslpppoe\fR | \fIv110async\fR | \fIv120async\fR
 ISDN protocol to use. With \fIhdlc\fR and \fIadskpppoe\fR,
 the \fIsync\fR option must be added to the pppd.
-With \fIx75\fR, \fIv42bis\fR and \fImodem\fR, the \fIsync\fR option
-MUST NOT be enabled. Default value is \fIhdlc\fR.
-Not all controllers support \fIv42bis\fR and \fImodem\fR.
+With \fIx75\fR, \fIv42bis\fR, \fImodem\fR, \fIv110async\fR and \fIv120async\fR
+the \fIsync\fR option MUST NOT be enabled. Default value is \fIhdlc\fR.
+Not all controllers support \fIv42bis\fR, \fImodem\fR and \fIv120async\fR.
 \fIadslpppoe\fR is currently only supported by the second
 controller of the FRITZ!Card DSL.
 Use capiinfo(8) to view which features your controller supports.

pppdcapiplugin/capiplugin.c

@@ -111,9 +111,11 @@ static STRINGLIST *inmsns;
 #define PROTO_X75		1
 #define PROTO_V42BIS		2
 #define PROTO_MODEM		3
-#define PROTO_ADSLPPPOE		4
-#define PROTO_ADSLPPPOA		5
-#define PROTO_ADSLPPPOALLC	6
+#define PROTO_V110_ASYNC	4
+#define PROTO_V120_ASYNC	5
+#define PROTO_ADSLPPPOE		6
+#define PROTO_ADSLPPPOA		7
+#define PROTO_ADSLPPPOALLC	8
 static char *opt_proto = "hdlc";
 static int proto = PROTO_HDLC;
 static int opt_vpi = -1; /* T-DSL: 1  */
@@ -368,6 +370,10 @@ static void plugin_check_options(void)
 	   proto = PROTO_V42BIS;
 	} else if (strcasecmp(opt_proto, "modem") == 0) {
 	   proto = PROTO_MODEM;
+	} else if (strcasecmp(opt_proto, "v110async") == 0) {
+	   proto = PROTO_V110_ASYNC;
+	} else if (strcasecmp(opt_proto, "v120async") == 0) {
+	   proto = PROTO_V120_ASYNC;
 	} else if (strcasecmp(opt_proto, "adslpppoe") == 0) {
 	   proto = PROTO_ADSLPPPOE;
 	   if (!opt_channels) opt_channels = "1";
@@ -1262,6 +1268,12 @@ accept:
            case PROTO_MODEM:
 	      (void) capiconn_accept(cp, 8, 1, 0, 0, 0, 0, 0);
 	      break;
+           case PROTO_V110_ASYNC:
+	      (void) capiconn_accept(cp, 2, 1, 0, 0, 0, 0, 0);
+	      break;
+           case PROTO_V120_ASYNC:
+	      (void) capiconn_accept(cp, 0, 9, 0, 0, 0, 0, 0);
+	      break;
 	}
 	conn_remember(cp, CONNTYPE_INCOMING);
 	(void) capiconn_listen(ctx, controller, 0, 0);
@@ -1423,6 +1435,26 @@ static capi_connection *setupconnection(char *num, int awaitingreject)
 				0, 0, 0,
 				opt_channels ? AdditionalInfo : 0,
 				0);
+	} else if (proto == PROTO_V110_ASYNC) {
+		cp = capiconn_connect(ctx,
+				controller, /* contr */
+				2, /* cipvalue */
+				opt_channels ? 0 : number, 
+				opt_channels ? 0 : opt_msn,
+				2, 1, 0,
+				0, 0, 0,
+				opt_channels ? AdditionalInfo : 0,
+				0);
+	} else if (proto == PROTO_V120_ASYNC) {
+		cp = capiconn_connect(ctx,
+				controller, /* contr */
+				2, /* cipvalue */
+				opt_channels ? 0 : number, 
+				opt_channels ? 0 : opt_msn,
+				0, 9, 0,
+				0, 0, 0,
+				opt_channels ? AdditionalInfo : 0,
+				0);
 	} else if (proto == PROTO_ADSLPPPOE) {
 		cp = capiconn_connect(ctx,
 				controller, /* contr */

pppdcapiplugin/peers/t-dsl

@@ -0,0 +1,33 @@
+# Ondemand Verbindung zu T-DSL über die Fritz!Card DSL
+debug
+sync
+noauth
+defaultroute
+lcp-echo-interval 5
+lcp-echo-failure 3
+lcp-max-configure 50
+lcp-max-terminate 2
+noccp
+noipx
+#
+persist
+demand
+connect ""
+#
+mru 1490
+mtu 1490
+ipcp-accept-local
+ipcp-accept-remote
+#
+#
+#
+plugin userpass.so
+username 000000000000\#000000000000\#0001\#@t-online.de
+password 00000000
+linkname t-dsl
+ipparam internet
+plugin capiplugin.so
+controller 2
+protocol adslpppoe
+:
+/dev/null