Commit Graph

14355 Commits

Author SHA1 Message Date
jim-p
e22eca3662 Use different logic for this function, copied from crypt_acb.php. Ticket #537 2010-06-09 15:40:19 -04:00
Scott Ullrich
901aa044a5 Include rrd.inc if dump_rrd_to_xml() is not found to be included to avoid Fatal error: Call to undefined function dump_rrd_to_xml() in /etc/inc/upgrade_config.inc on line 1752 2010-06-09 15:06:01 -04:00
gnhb
4a1ee8ac31 Clean up pptp a bit and modify text description in interfaces_ppps_edit 2010-06-10 01:39:49 +07:00
gnhb
3a7658652c Merge branch 'mlppp'
Conflicts:
	usr/local/www/interfaces_ppp_edit.php
2010-06-10 00:29:47 +07:00
gnhb
d09ca87e5e Fix up upgrade function for new PPPs implementation. 2010-06-10 00:07:15 +07:00
gnhb
33d2e5106b Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp 2010-06-09 23:20:50 +07:00
gnhb
1d7e1d6c2c Fix up for new ptpid scheme and new iface naming scheme. 2010-06-09 22:51:59 +07:00
gnhb
21e17a37a2 Fix missing "or" ||. 2010-06-09 22:20:31 +07:00
gnhb
f748082929 Fix up for new ptpid scheme and iface name scheme. 2010-06-09 22:17:22 +07:00
gnhb
99c26d44ae Make assignment work with new ptpid and if name structure. 2010-06-09 22:02:10 +07:00
gnhb
5c8e8a17e3 Make pppoe reset work again with new <if> naming scheme.
Previous commit also moved pppoe reset functions to interfaces.inc
so we don't have to duplicate in interfaces.php and interfaces_ppps_edit.php

Also, add code so that when ppp config section gets deleted, associated <cron>
item gets deleted for pppoe-reset cron items.
2010-06-09 21:40:12 +07:00
gnhb
e5d558bfac Change ptpid to use sequential number. This makes Ermal happy. :)
Also add <if> section to <ppps><ppp> which is ppp type + ptpid.`
2010-06-09 21:14:59 +07:00
jim-p
af8fca8f91 Don't delete these additional files until the end of the package uninstall process. Otherwise files needed in some steps will be missing. Should fix some outstanding package issues (especially uninstall/reinstall issues). At the very least this fixes uninstall/reinstall of OpenVPN Client Export. 2010-06-08 16:48:56 -04:00
gnhb
5dc6f9b4ec Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp 2010-06-08 22:48:35 +07:00
gnhb
513b762e7a Add check for required fields for PPP connections. 2010-06-08 22:39:03 +07:00
gnhb
8256f32408 Fix all issues that Ermal found.
Interfaces.php problems.
1- When creating a pppoe ptpid on the config is empty(<<ptpid/>).
2- after switching from pppoe to pptp in the config there remains
pppoe-reset-type which is not that much of a bug but needs to be
fixed.
3- When choosing ppp type even though i do not have a device i am
allowed to save. After saving it switches to none type automatically.
The <ppp> section still has values of pptp config and some of pppoe
and only the apn related to ppp. The interface assignment still has
teh interface pptp1! (This is quite buggy i would say.)

Interfaces -> assign
1- After doing all the tests on interfaces.php everything is shown
with ppp() on interfaces.php picture attached. (probably an issue with
how you do find ppp interfaces around.)
2- MPD is started even though the interface is not enabled after assignment.
3- During assignment as i tell you even below remove teh pptpid from
the interface an duse interface name.

Interfaces -> assign -> ppp
1- I have an emtpy thing in there when i do all the actions on interfaces.php
2010-06-08 22:32:25 +07:00
gnhb
58cbe016de Trim the output. This only nails you if your interface is last in the list. 2010-06-08 22:06:51 +07:00
gnhb
743994a651 Give more time for getting dhcp address and DNS lookup. 2010-06-08 18:46:56 +07:00
gnhb
b20f736344 Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp 2010-06-08 07:06:46 +07:00
Ermal
f4a17fcfe7 Be consistent on % for loss state. 2010-06-07 21:32:47 +00:00
Ermal
9ae7d46f5d Catch up with php limits. 2010-06-07 21:24:37 +00:00
Ermal
de42da413f Show some sensible defaults for delay and loss. 2010-06-07 21:17:30 +00:00
Ermal
66a96e72c0 Reorganize code to be able to actually use the lookup_gateway_ip_by_name() function to find even dynamic gateways ip. 2010-06-07 21:08:11 +00:00
Scott Ullrich
ac7609c2b6 Binaries should not be in the git repo 2010-06-07 16:55:13 -04:00
Scott Ullrich
906bf57a64 Binaries should not be in the git repo 2010-06-07 16:54:46 -04:00
Scott Ullrich
80b38739e9 Binaries should not be in the git repo 2010-06-07 16:54:11 -04:00
Scott Ullrich
571f89a2d0 Binaries should be in the git repo 2010-06-07 16:53:27 -04:00
Ermal
5a5447abab Correctly check when to actually save dynamic gateways or not. 2010-06-07 20:52:32 +00:00
Ermal
4b4be09e1d Actually show other data with gateways status. 2010-06-07 20:34:51 +00:00
Ermal
beb7b8140c Correctly control status of gateways. These code is tripled in these pages not sure what is the best solution. 2010-06-07 19:17:00 +00:00
gnhb
277d0250b0 Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
	etc/inc/interfaces.inc
	etc/inc/pfsense-utils.inc
2010-06-07 23:24:17 +07:00
gnhb
c1cc447c5d Fix up little things. 2010-06-07 23:15:36 +07:00
jim-p
0496997630 Fix some typos/omissions. 2010-06-07 12:02:21 -04:00
jim-p
09f2bf85e6 Honor GUI configured DNS settings for PPTP/PPPoE/L2TP if present. 2010-06-07 11:54:42 -04:00
gnhb
3a906378cb Initial support for DCHP+PPtP/L2tP. DHCP + PPPoE is supported too.
Must create an OPTx interface and set to DHCP for DHCP+PPPoE.
2010-06-07 22:42:31 +07:00
gnhb
ebdbdbc26b Make display of interface name and uptime work again on status_interfaces.php 2010-06-06 19:52:28 +07:00
gnhb
692730bf32 One more $if changed to $ifdescr and remove unneccessary line. 2010-06-06 11:15:06 +07:00
gnhb
f78c597561 Revert "One more $if must change to $ifdescr"
This reverts commit a045b3270f.

Not correct.
2010-06-06 10:41:57 +07:00
gnhb
a045b3270f One more $if must change to $ifdescr 2010-06-06 10:40:41 +07:00
gnhb
ba7b2b86cc Merge branch 'master' of rcs.pfsense.org:pfsense/mainline 2010-06-06 10:34:01 +07:00
gnhb
6598286810 Some $config variable referencing $if but $if is not defined.
Change $if to $ifdescr to restore normal functionality.
2010-06-06 07:48:33 +07:00
gnhb
cac14686eb Fix javascript error and apn id so not duplicate id in html. 2010-06-05 20:57:11 +07:00
Ermal
5523fa3d2d Fixes #632. Actually pass the interface and not the vip configuration to the function. 2010-06-04 16:34:14 +00:00
Ermal
956950dea4 Fixes #374. Actually reload teh dhcpleases utility whenever the hosts files is regenerated to avoid problems. 2010-06-04 15:57:08 +00:00
gnhb
7db2ef5fd8 Simplify GUI even more, especially for PPP connections. 2010-06-04 07:20:41 +07:00
Ermal
922693e929 Silence is better for this command. 2010-06-03 20:41:31 +00:00
Ermal
6d5446a2cb Add some missing code to convert_real_interface_to_friendly_interface_name. There is no need to go through all the interfaces just to find out if an interface has a gateway or not and is the same for finding the real interface name of a friendly interface. Also while here do not rely on stristr for finding if an interface exists rather do a proper matching on interface name otherwise wrong results might come up. 2010-06-03 19:56:42 +00:00
jim-p
f81cfcc92e Use require_once instead of require, in case these files have been loaded previously. Fixes #631 2010-06-03 15:40:34 -04:00
Ermal
ae9618afa8 Return the gateway status only for gateways apinger knows about instead of assuming that all gateways are down, which might give consecuences. Also prepend 'filter_' to the function used to kill states for down gateways in filter.inc to be consistent. 2010-06-03 18:22:13 +00:00
gnhb
8adc1e49ad Set default values to what we've had in the past.
`
2010-06-03 23:27:38 +07:00