diff --git a/vpn-daemons/pptp/properties/nm-ppp-dialog.glade b/vpn-daemons/pptp/properties/nm-ppp-dialog.glade index 4b6888750d..5084a5b43d 100644 --- a/vpn-daemons/pptp/properties/nm-ppp-dialog.glade +++ b/vpn-daemons/pptp/properties/nm-ppp-dialog.glade @@ -24,87 +24,132 @@ 12 - + True - Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting. - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - - True - False - 6 + True + True + True + GTK_POS_TOP + False + False - + + 10 True False - 6 + 0 - + True - <b>Connection Name</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + False + 8 - + + 4 True False 6 - + True - _Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" - True - False + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 6 + + + + True + False + 0 + + + + True + Type: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + + + 0 + True + True + + + + + 0 + False + True + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + 4 + True + False + 6 + + + + True + <b>Connection Name</b> + False + True GTK_JUSTIFY_LEFT - True + False False - 0 + 0.00999999977648 0.5 0 0 @@ -117,130 +162,68 @@ - + True - True - True - True - 0 - - True - * - False - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Required Information</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - Connection Type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 6 - - - True - - - Connection type - + + + True + _Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" + True + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + + + 0 + False + True + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + - - 0 - True - True - 0 - False + True True @@ -265,6 +248,428 @@ + + 0 + True + True + + + + + + True + False + 0 + + + + False + 4 + + + + True + False + 12 + + + + True + _Gateway: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + False + False + + + + + + True + Host name or IP address of the PPTP server + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + False + 4 + + + + True + False + 12 + + + + True + _Telephone Number: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + False + False + + + + + + True + Host name or IP address of the PPTP server + True + True + True + 0 + + True + * + False + + Telephone number to dial + + + + 0 + True + True + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + False + 4 + + + + True + 2 + 2 + False + 5 + 10 + + + + True + True + Find Device + True + GTK_RELIEF_NORMAL + True + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + False + 12 + + + + True + _Channel: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + False + False + + + + + + True + True + True + True + 3 + + True + * + False + + + 0 + True + True + + + + + 1 + 2 + 0 + 1 + fill + + + + + + True + False + 12 + + + + True + _Device Address: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + False + False + + + + + + True + Host name or IP address of the PPTP server + True + True + True + 17 + 00:00:00:00 + True + * + False + + + 0 + True + True + + + + + 0 + 1 + 0 + 1 + fill + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + GTK_BUTTONBOX_END + 0 + + + + True + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Import Saved Configuration... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + @@ -275,84 +680,63 @@ - 0 - False - True + True + True - + True - True - False + Connection + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 10 + True + False 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + False + 4 - + True False - 4 + 12 - + True - False - 12 - - - - True - _Gateway: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote - - - 0 - False - False - - - - - - True - Host name or IP address of the PPTP server - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + _Access Point Name: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote 0 @@ -360,857 +744,515 @@ False + + + + True + Service providers GPRS access point from device config + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + 0 + False + False + + + + + + True + False + 12 + + + + True + _IP Address: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + False + False + + + + + + True + Service providers IP address + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + 12 + + + + True + _Packet Type + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + 9 + + + 0 + True + True + + + + + + True + _Context Num + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + 3 + + + 0 + True + True + + + + + 0 + True + True + - - - - - True - <b>PPTP options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + False + False - 0 - True - True + False + True - + True - True - False - 0 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 4 - - - - True - False - 12 - - - - True - _Telephone Number: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote - - - 0 - False - False - - - - - - True - Host name or IP address of the PPTP server - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - - - - - True - <b>Dial-up options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - + GPRS Options + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 - 0 - True - True + tab - + + 10 True - True - False + False 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + False + 0 - + True - False - 4 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 - + True + 4 + 1 False - 12 + 0 + 0 - + True - _Device Address: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote - - - 0 - False - False - - - - - - True - Host name or IP address of the PPTP server + When this check box is cleared the "noauth" option is passed to pppd. True - True - True - 17 - 00:00:00:00 - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - _Channel: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote - - - 0 - False - False - - - - - - True - True - True - True - 3 - - True - * - False - - - 0 - True - True - - - - - - True - True - Find Device + Authenticate Peer True GTK_RELIEF_NORMAL True + False + False + True - 0 - False - False + 0 + 1 + 0 + 1 + fill + + + + + + + True + When checked the "refuse-eap" option is passed to pppd. + True + Refuse EAP + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + When checked the "refuse-chap" option is passed to pppd. + True + Refuse CHAP + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + When checked the "refuse-mschap" option is passed to pppd. + True + Refuse MS CHAP + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 1 + 3 + 4 + fill + - - 0 - True - True - + + 0 + True + True + - - - - - True - <b>Bluetooth options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + False + False - 0 - True - True + False + True - + True - True - False + Authentication + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 10 + True + False 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + False + 6 - + True - False - 4 - - - - True - False - 4 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 18 - 0 - - - - True - 1 - 2 - False - 4 - 13 - - - - True - True - Modem Connection - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - Hardware RTS/CTS - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - - - 0 - True - True - - - - - 0 - False - False - - + <b>Compression</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.00999999977648 + 0.5 + 0 + 0 + + 0 + False + False + - - - - - - True - <b>Serial options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - True - False - 0 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - + True - False - 4 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 - + True + 2 + 2 False - 12 + 4 + 13 - + True - _Access Point Name: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote - - - 0 - False - False - - - - - - True - Host name or IP address of the PPTP server + If Deflate compression is not allowed the 'nodefate' option is passed to pppd True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - _IP Address: + Allow Deflate compression True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote + GTK_RELIEF_NORMAL + True + False + False + True - 0 - False - False + 0 + 1 + 1 + 2 + fill + - + True - Host name or IP address of the PPTP server + If BSD compression is not allowed the 'nobsdcomp' option is passed to pppd True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - _Packet Type + Allow BSD Compression True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote + GTK_RELIEF_NORMAL + True + False + False + True - 0 - False - False + 1 + 2 + 1 + 2 + fill + - + True - Host name or IP address of the PPTP server + When checked the 'require-mppc' option is passed to pppd True - True - True - 0 - - True - * - False - 9 - - - 0 - True - True - - - - - - True - _Context Num + Require MPPC Compression True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote + GTK_RELIEF_NORMAL + True + False + False + True - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - Host name or IP address of the PPTP server - True - True - True - 0 - - True - * - False - 3 - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - - - True - <b>GPRS options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - True - False - 4 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 4 - - - - True - False - 4 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 18 - 0 - - - - True - 1 - 2 - False - 4 - 13 - - - - True - True - Require Explicit IP Addr - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - True - Use Peer DNS - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 4 - - - - True - Compression and encryption + False - True + False GTK_JUSTIFY_LEFT False False @@ -1220,651 +1262,71 @@ 0 - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 18 - 0 - - - - True - 2 - 2 - False - 4 - 13 - - - - True - True - MPPE encryption - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - MPPC Compression - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - True - Deflate compression - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - BSD Compression - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - - - - - - 0 - True - True + 1 + 2 + 0 + 1 + fill + - - 0 - True - True - - - - - - True - True - Exclusive device access (UUCP-style lock) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Authenticate Peer - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - False - 0 - - - - True - False - 0 - - - - True - False - 12 - - - - True - 2 - 2 - False - 1 - 10 - - - - True - mtu - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - mru - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - 75 - True - Maximum Transmit Unit - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1000 0 100000 10 100 100 - - - 1 - 2 - 0 - 1 - - - - - - - True - Maximum Receive Unit - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1000 0 10000 10 100 100 - - - 1 - 2 - 1 - 2 - - - - - - 0 - False - False - - - - - - True - 3 - 2 - False - 1 - 10 - - - - True - connect-delay - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - lcp-echo-failure - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Disconnect after this many LCP echo requests fail - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 10 0 1000 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - lcp-echo-interval - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Time in seconds between echo requests - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 10 0 1000 1 10 10 - - - 1 - 2 - 2 - 3 - - - - - - - True - Disconnect after this many LCP echo requests fail - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 30000 100 1000 1000 - - - 1 - 2 - 0 - 1 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - True - Numeric Tweaks - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - False - 12 - - - - True - _Custom PPP options: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote - - - 0 - False - False - - - - - - True - Host name or IP address of the PPTP server - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - Debug Output - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - + + 0 + True + True + - - - - - - True - <b>PPP options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - True - False - 4 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - + True - False - 4 + <b>Encryption</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.00999999977648 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 - - True - True - Peer DNS through tunnel - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 0 - False - False - - - - - + True + 2 + 1 False - 0 + 0 + 0 - + True True - _Only use VPN connection for these addresses + Require MPPE encryption True GTK_RELIEF_NORMAL True @@ -1873,80 +1335,298 @@ True - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - True - False - True - True - True - 0 - - True - * - False - - - 0 - False - False - - - - - - True - <i>example: 172.16.0.0/16 10.11.12.0/24</i> - False - True - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 42 - 0 - - - 0 - False - False - - - - + True + Require 128 bit MPPE encryption + True + GTK_RELIEF_NORMAL + True + False + False + True - 0 - True - True + 0 + 1 + 1 + 2 + fill + + + + + 0 + True + True + + + + + 0 + False + False + + + + + False + True + + + + + + True + Compression & Encryption + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 10 + True + False + 0 + + + + True + False + 6 + + + + True + 2 + 2 + False + 0 + 0 + + + + True + A list of extra options to pppd as would be typed on the command line + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + _Custom PPP options: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + pptp-remote + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + For security reasons, options entered in the box above are checked against a list of allowed options before a connection is established. Currently there are no options on the list. + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 6 + 4 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + 0 + False + False + + + + + + True + <b>IP Options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.00999999977648 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 4 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 + + + + True + 1 + 2 + False + 4 + 13 + + + + True + When checked this sets the pppd 'noipdefault' option + True + Require Explicit IP Addr + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + When checked this sets the pppd 'usepeerdns' option + True + Use Peer DNS + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + 0 True @@ -1954,122 +1634,802 @@ + + 0 + True + True + - - - - - - True - <b>Routing options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - False - True - - - - - - True - GTK_BUTTONBOX_END - 0 - - - - True - True - True - GTK_RELIEF_NORMAL - True - + True 0.5 0.5 - 0 - 0 + 1 + 1 0 0 - 0 + 18 0 - + True + 1 + 1 False - 2 + 0 + 0 - + True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Import Saved Configuration... + When checked the 'lock' option is passed to pppd + True + Exclusive device access (UUCP-style lock) True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + GTK_RELIEF_NORMAL + True + False + False + True - 0 - False - False + 0 + 1 + 0 + 1 + fill + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 + + + + True + 1 + 1 + False + 0 + 0 + + + + True + When checked this sets the pppd 'debug' option and adds some extra information from the NetworkManager plugin + True + Debug Output + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + + 0 + False + False + + + + + + True + <b>Packet Parameters</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.00999999977648 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 + + + + True + 1 + 2 + False + 1 + 77 + + + + True + False + 6 + + + + True + MTU + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + 75 + True + Maximum Transmit Unit + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1000 0 100000 10 100 100 + + + 0 + True + True + + + + + 0 + 1 + 0 + 1 + + + + + + True + False + 6 + + + + True + MRU + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Maximum Receive Unit + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1000 0 10000 10 100 100 + + + 0 + True + True + + + + + 1 + 2 + 0 + 1 + fill + + + + + + + 0 + True + True + + + + + + True + <b>Delays and TImeouts</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.00999999977648 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 + + + + True + 3 + 2 + False + 1 + 10 + + + + True + connect-delay + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + lcp-echo-failure + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Disconnect after this many LCP echo requests fail + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 10 0 1000 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + + True + lcp-echo-interval + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Time in seconds between echo requests + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 10 0 1000 1 10 10 + + + 1 + 2 + 2 + 3 + + + + + + + True + Disconnect after this many LCP echo requests fail + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 30000 100 1000 1000 + + + 1 + 2 + 0 + 1 + + + + + + + + 0 + True + True + + + 0 + False + False + - 0 - False - True + False + True + + + + + + True + PPP Options + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 10 + True + False + 0 + + + + True + False + 4 + + + + True + False + 4 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 18 + 0 + + + + True + 1 + 2 + False + 4 + 13 + + + + True + True + Modem Connection + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + Hardware RTS/CTS + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 1 + 2 + 0 + 1 + fill + + + + + + + + 0 + True + True + + + + + 0 + False + False + + + + + 0 + True + True + + + + + False + True + + + + + + True + Serial Options + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 10 + True + False + 0 + + + + True + False + 4 + + + + True + True + Peer DNS through tunnel + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 0 + False + False + + + + + + True + False + 0 + + + + True + True + _Only use VPN connection for these addresses + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + False + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + True + <i>example: 172.16.0.0/16 10.11.12.0/24</i> + False + True + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 42 + 0 + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + False + True + + + + + + True + Routing + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab 0 - True + False True diff --git a/vpn-daemons/pptp/properties/nm-ppp-properties.c b/vpn-daemons/pptp/properties/nm-ppp-properties.c index e3a3175e39..9cceb8189b 100644 --- a/vpn-daemons/pptp/properties/nm-ppp-properties.c +++ b/vpn-daemons/pptp/properties/nm-ppp-properties.c @@ -48,14 +48,11 @@ "ppp-debug=no;" \ "usepeerdns=yes;" \ "usepeerdns-overtunnel=yes;" \ - "encrypt-mppe=yes;" \ - "compress-mppc=no;" \ "ppp-lock=yes;" \ "ppp-auth-peer=no;" \ - "compress-bsd=no;" \ - "compress-deflate=no;" \ - "mru=1000;" \ - "mtu=1000;" \ + "refuse-eap=no;" \ + "refuse-chap=no;" \ + "refuse-mschap=no;" \ "lcp-echo-failure=10;" \ "lcp-echo-interval=10;" \ "use-routes=no;" \ @@ -73,13 +70,34 @@ "ppp-modem=yes;" \ "usepeerdns=yes;" \ "ppp-connect-delay=5000;" -#define VPNUI_BTGPRS_DEFAULTS "ppp-connection-type=btgprs;" +#define VPNUI_BTGPRS_DEFAULTS "ppp-connection-type=btgprs;" \ + "encrypt-mppe=no;" \ + "encrypt-mppe-128=no;" \ + "compress-mppc=no;" \ + "compress-bsd=no;" \ + "compress-deflate=no;" \ + "mru=1000;" \ + "mtu=1000;" #define VPNUI_PPTP_DEFAULTS "pptp-remote='';" \ - "ppp-connection-type=pptp;" + "ppp-connection-type=pptp;" \ + "encrypt-mppe=no;" \ + "encrypt-mppe-128=yes;" \ + "compress-mppc=no;" \ + "compress-bsd=no;" \ + "compress-deflate=no;" \ + "mru=1400;" \ + "mtu=1400;" #define VPNUI_DIALUP_DEFAULTS "phone-number=THIS DOESN'T DO ANYTHING;" \ "ppp-crtscts=yes;" \ "ppp-modem=yes;" \ - "ppp-connection-type=dialup;" + "ppp-connection-type=dialup;" \ + "encrypt-mppe=no;" \ + "encrypt-mppe-128=no;" \ + "compress-mppc=no;" \ + "compress-bsd=no;" \ + "compress-deflate=no;" \ + "mru=1000;" \ + "mtu=1000;" #ifdef NMVPNUI_PPTP_PROPERTIES_C #endif @@ -99,7 +117,7 @@ impl_setup (NetworkManagerVpnUIImpl *impl) GSList *item; VpnUIConfigOption *opt; VpnUIVariant *variant; - VpnUIExpander *expand; +// VpnUIExpander *expand; g_return_if_fail(impl!=NULL); impl->display_name = VPNUI_DISPLAY_NAME; @@ -184,6 +202,11 @@ impl_setup (NetworkManagerVpnUIImpl *impl) "encrypt-mppe", "Encrypt-MPPE", _("Use MPPE encryption"), NULL, NULL, impl ); + opt = vpnui_opt_new( + "encrypt-mppe-128" , VPN_UI_OPTTYPE_YESNO , + "encrypt-mppe-128", "Encrypt-MPPE-128", _("Use 128 bit MPPE encryption"), + NULL, NULL, impl ); + opt = vpnui_opt_new( "compress-mppc" , VPN_UI_OPTTYPE_YESNO , "compress-mppc", "Compress-MPPC", _("Use MPPC compression"), @@ -209,6 +232,21 @@ impl_setup (NetworkManagerVpnUIImpl *impl) "ppp-auth-peer", "Auth-Peer", _("Authenticate remote peer"), NULL, NULL, impl ); + opt = vpnui_opt_new( + "ppp-refuse-eap" , VPN_UI_OPTTYPE_YESNO , + "ppp-refuse-eap", "Refuse-EAP", _("Refuse EAP"), + NULL, NULL, impl ); + + opt = vpnui_opt_new( + "ppp-refuse-chap" , VPN_UI_OPTTYPE_YESNO , + "ppp-refuse-chap", "Refuse-CHAP", _("Refuse CHAP"), + NULL, NULL, impl ); + + opt = vpnui_opt_new( + "ppp-refuse-mschap" , VPN_UI_OPTTYPE_YESNO , + "ppp-refuse-mschap", "Refuse-MSCHAP", _("Refuse MSCHAP"), + NULL, NULL, impl ); + opt = vpnui_opt_new( "mtu" , VPN_UI_OPTTYPE_SPINNER , "mtu", "MTU", _("Maximum transmit unit (in bytes)"), @@ -275,13 +313,13 @@ impl_setup (NetworkManagerVpnUIImpl *impl) impl); // // GLADE NAME IMPLEMENTATION_OBJ - expand= vpnui_expand_new ("routing-expander",impl); - expand= vpnui_expand_new ("dialup-expander",impl); - expand= vpnui_expand_new ("pppd-expander",impl); - expand= vpnui_expand_new ("pptp-expander",impl); - expand= vpnui_expand_new ("bluetooth-expander",impl); - expand= vpnui_expand_new ("serial-expander",impl); - expand= vpnui_expand_new ("gprs-expander",impl); +// expand= vpnui_expand_new ("routing-expander",impl); +// expand= vpnui_expand_new ("dialup-expander",impl); +// expand= vpnui_expand_new ("pppd-expander",impl); +// expand= vpnui_expand_new ("pptp-expander",impl); +// expand= vpnui_expand_new ("bluetooth-expander",impl); +// expand= vpnui_expand_new ("serial-expander",impl); +// expand= vpnui_expand_new ("gprs-expander",impl); // Attach to press event of the Bluetooth "Find Device" button. // will need libbtcl @@ -334,7 +372,7 @@ variant_changed (GtkComboBox *combo, gpointer user_data) vpnui_variant_select_byname(impl,variant_name); - vpnui_expand_reset_all(impl); +// vpnui_expand_reset_all(impl); if (impl->callback != NULL) { gboolean is_valid;