Project

General

Profile

« Previous | Next » 

Revision c90f2471

Added by Marcus Brown over 15 years ago

Changes to make PPP work again. mpd5 fails to establish a ppp link without
some username and password, so defaults are set if user enters nothing.
Removed interface_ppp_configure call from interfaces_ppp_edit.php. It was
useless there with the new structure, and it caused all PPP links to attempt
to connect when user presses "Save" even before they are assigned to LAN/WAN, etc.

Also, fix up pfsense-utils.inc and status_interfaces.php
to display more info on status_interfaces.php.

Changed util.inc to allow cua* interfaces to be recognized as real interfaces as
pfSense got "interface mismatch" at boot and forced user to reassign. Maybe someone
else has a better way to do this.

View differences:

etc/inc/interfaces.inc
969 969
	}
970 970

  
971 971
	$mpdconf .= <<<EOD
972
# Create link.
973 972
	create link static lnk{$interface} modem
974 973
	set link disable chap pap
975 974
	set link accept chap pap eap
976 975
	set link enable no-orig-auth
977
# To make Ringback work we should specify how to handle incoming calls originated by it.
978 976
	#set link enable incoming
979 977
	set link action bundle {$interface}
980 978

  
981 979
EOD;
982 980

  
983
	if (!empty($ppp['username'])) {
981
	if (empty($ppp['username'])) {
982
		$ppp['username'] = "user";
983
		$ppp['password'] = "none";
984
	}
985
	if (empty($ppp['password']))
986
		$ppp['password'] = "none";
987

  
984 988
		$mpdconf .= <<<EOD
985 989
	set auth authname "{$ppp['username']}"
986
    set auth password "{$ppp['password']}"
990
	set auth password {$ppp['password']}
987 991

  
988 992
EOD;
989
	}
990 993

  
991 994
	$mpdconf .= <<<EOD
992 995
	set modem device {$ppp['port']}

Also available in: Unified diff