Commit Graph

20639 Commits

Author SHA1 Message Date
Phil Davis
2cd249edf0 Make not LAN address etc rules work
I cannot understand how this worked anywhere in the recent past. The code fragment:
if(isset($rule[$target]['not']))
	$src = " !{$src}";$src = " !{$src}";
Appeared in multiple if/else clauses but was missing in 2 places, which I have added.
Actually, it is now duplicated in every part of the filter_generate_address if/else structure, and so it could be applied once at the end of the routine.
I have taken the minimal risk approach here, since I am not in a position to test every if/else case properly. But I can easily create a version that removes the code duplication, and someone else can test it well before committing (this is a fundamental bit of rule code that everyone uses, so I don't want to accidenatally break it worse for some poor sod.)
2013-02-04 10:00:59 +05:45
jim-p
990fa101b6 Add a means to force a fsck (on rare occasions the fs is not marked dirty, but still needs fsck run to fix errors) 2013-02-02 21:36:39 -05:00
jim-p
2085c6de5d Add a manual way for someone to set TRIM if they really want it. touch /root/TRIM_set and reboot to set, touch /root/TRIM_unset to clear.
Have to reboot after setting the tunefs flag or when mount is run, it clears any changes. No way to do it on the fly.
2013-02-02 21:30:31 -05:00
Jim P
8fd76a0704 Merge pull request #369 from bcyrill/dyndns_rfc
Gray-out disabled RFC2136 entries
2013-02-02 16:53:26 -08:00
Jim P
38c5c7b84f Merge pull request #368 from bcyrill/dyndns_disable
Gray-out disabled DynDNS entries
2013-02-02 16:53:11 -08:00
bcyrill
e5da6830ae Gray-out disabled RFC2136 entries 2013-02-02 14:29:30 +01:00
bcyrill
e766bd84c3 Whitespaces 2013-02-02 14:24:14 +01:00
bcyrill
51ce2ea779 Gray-out disabled DynDNS entries 2013-02-02 14:10:45 +01:00
bcyrill
5a39eb2b68 Whitespaces 2013-02-02 13:56:20 +01:00
Jim P
49b12e444e Merge pull request #367 from bcyrill/patch-8
Add hw.usb.no_pf="1" to loader.conf on nanobsd
2013-02-01 18:52:53 -08:00
bcyrill
3be7f5e7d8 Add hw.usb.no_pf="1" to loader.conf on nanobsd 2013-02-01 22:58:38 +01:00
Jim P
c5e48525b4 Merge pull request #366 from bcyrill/patch-5
Correct IP family mix-up.
2013-02-01 13:21:42 -08:00
bcyrill
60037e00aa Update usr/local/www/system_gateways_edit.php
Correct IP family mix-up.
2013-02-01 22:18:21 +01:00
Renato Botelho
3d54aa10ca Avoid killing apinger's rrdtool processes on kill_traffic_collector(). It helps a problem reported on comment of ticket #1399 2013-02-01 16:59:46 -02:00
Renato Botelho
48126e256f Avoid duplicate hw.usb_no_pf entry on loader.conf 2013-02-01 14:02:14 -02:00
Renato Botelho
25c088de57 Hide usbus# from interfaces list. Fixes #2306 2013-02-01 13:57:59 -02:00
Jim P
69efe7c67f Merge pull request #365 from phil-davis/master
Allow clear package lock when 1st install fails
2013-02-01 07:08:32 -08:00
Renato Botelho
53bc1f3868 Removed unused block of code 2013-02-01 11:22:07 -02:00
Phil Davis
b328217211 Display only needed Reinstall and Clear Package Lock buttons
Make the code a bit smarter, so the user only sees whichever of the reinstall and clear package lock buttons that are actually relevant.
2013-02-01 13:04:33 +05:45
Phil Davis
e27953e73a Allow clear package lock when 1st install fails
I upgraded a system this morning. An issue during the 1st package reinstall caused the package lock to be set, but no packages installed. The Backup/Restore GUI page did not show the section for resetting the package lock, because it only displays that if there is at least 1 package installed - catch-22.
This fixes that odd condition.
2013-02-01 11:51:48 +05:45
Ermal
8f563bb423 Use the better -Fs modifies to pf to kill the states by interface. Also kill both sides on an interface when -k needs to be used 2013-01-31 22:04:07 +00:00
Ermal
b686e5d0ce Load if_stf module if has not been done 2013-01-31 20:26:07 +00:00
Renato Botelho
d187805383 Add missing parameter to interface_track6_configure() call 2013-01-31 14:31:48 -02:00
Renato Botelho
3d92cd885b Fix a typo 2013-01-31 13:12:52 -02:00
Ermal
ef1c048b0f Do delayed handling of track6 interfaces a bit earlier. More thoughts need to be done on the track6 configuration 2013-01-31 14:06:39 +00:00
Ermal
ceba035a48 Correct name as reported by phil-davis@github 2013-01-31 14:06:39 +00:00
Ermal Luçi
9d99f69abb Merge pull request #364 from mdima/master
Fix for links and PPS
2013-01-31 04:07:45 -08:00
Ermal
c4fc2eae5b Destroy the stf interface to avoid issues with ipv6 interface assignment. Also delete any previous address on track6 interfaces before assigning a new one. 2013-01-31 12:01:53 +00:00
Ermal
12aea7f16d Do not do any operation if its not necessary 2013-01-31 11:16:16 +00:00
Ermal
7a04cd20c4 Create link_interface_to_track6 to make code more readble and easily trackble. Also improve the generation of rules to avoid creating problems during filter reload and some optimizations with it 2013-01-31 11:07:59 +00:00
Ermal
dd1fc379b4 Actually destroy in this case 2013-01-31 08:08:20 +00:00
Ermal
4144aa8133 Do the right thing here 2013-01-31 08:07:50 +00:00
Michele Di Maria
6ba3121b27 Fixes links and PPS
This change fixes:
- Interface value in the links to the "Firewall: Traffic Shaper" page;
- Read the proper PPS value from the qstats XML file.
2013-01-31 09:07:36 +01:00
Chris Buechler
b0cde9765e Merge pull request #363 from phil-davis/master
Syntax error in vpn_pppoe.php
2013-01-30 22:00:14 -08:00
Phil Davis
11d3a15926 Syntax error in vpn_pppoe.php 2013-01-31 10:47:56 +05:45
Renato Botelho
0a0b17d90d Avoid mpd based services to set localip to an already used IP on the system. It should fix #1723 2013-01-30 17:08:28 -02:00
Renato Botelho
a1613b62bb is_ipaddr_configured() now returns VIPS 2013-01-30 17:08:28 -02:00
Renato Botelho
2bbc542949 Fix indent 2013-01-30 17:08:28 -02:00
Renato Botelho
5fa78adc75 Fix whitespaces and indent 2013-01-30 17:08:28 -02:00
Ermal Luçi
c11d666b90 Merge pull request #362 from bcyrill/patch-4
Adapt regex pattern for new stp interface naming
2013-01-30 11:06:23 -08:00
Ermal
9cd6b95023 Do more strict checks. Also silence some more log_error under debug. Also do some sanity checks on rc.newwanipv6 before doing any operation 2013-01-30 18:43:47 +00:00
bcyrill
1e8a05a2c1 Update etc/inc/interfaces.inc
With the new support for multiple stf interfaces their names have changed. Adapt the regex pattern.
2013-01-30 18:30:11 +01:00
Ermal
e2a282a0b9 Put more checks here 2013-01-30 17:07:41 +00:00
Ermal
7e86b57ecf Oops correct interface name 2013-01-30 17:07:41 +00:00
jim-p
23e3b2adce Whitespace fixes 2013-01-30 10:22:54 -05:00
jim-p
0acd271b3c Change output style to follow halt.php and reboot.php so the shutdown output appears in the correct location on the page. 2013-01-30 10:22:53 -05:00
Ermal
5ee79d322a Correct fetching ipv4 gateway by passing correct parameter 2013-01-30 13:47:21 +00:00
Ermal
b9688d6445 Silence error. Maybe the command should be removed completely! 2013-01-30 11:59:28 +00:00
Ermal
c87f4b7092 Fixes #1928. Disallow sync loop only for certain types of calls but not for exec_[php|shell]. Also fix CARP loop detection to use correct variable 2013-01-30 10:57:00 +00:00
Ermal
311959fe8b Ticket #2412. Also allow ipv6 traffic to flow on the stf interface 2013-01-30 10:43:34 +00:00