Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
e8496219
Commit
e8496219
authored
Aug 04, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src: fix crash reports
parent
3644a724
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
20 deletions
+42
-20
filter.inc
src/etc/inc/filter.inc
+15
-6
diag_packet_capture.php
src/www/diag_packet_capture.php
+6
-3
interfaces_gif.php
src/www/interfaces_gif.php
+2
-1
interfaces_ppps_edit.php
src/www/interfaces_ppps_edit.php
+9
-5
services_dhcp_relay.php
src/www/services_dhcp_relay.php
+8
-3
services_dyndns_edit.php
src/www/services_dyndns_edit.php
+1
-1
vpn_openvpn_export_shared.php
src/www/vpn_openvpn_export_shared.php
+1
-1
No files found.
src/etc/inc/filter.inc
View file @
e8496219
...
...
@@ -382,14 +382,23 @@ function filter_generate_scrubing() {
}
/* disable scrub option */
foreach
(
$FilterIflist
as
$scrubif
=>
$scrubcfg
)
{
if
(
isset
(
$scrubcfg
[
'virtual'
])
||
empty
(
$scrubcfg
[
'descr'
]))
if
(
isset
(
$scrubcfg
[
'virtual'
])
||
empty
(
$scrubcfg
[
'descr'
]))
{
continue
;
}
/* set up MSS clamping */
if
(
$scrubcfg
[
'mss'
]
<>
""
&&
is_numeric
(
$scrubcfg
[
'mss'
])
&&
isset
(
$scrubcfg
[
'if'
])
&&
$scrubcfg
[
'if'
]
!=
"pppoe"
&&
$scrubcfg
[
'if'
]
!=
"pptp"
&&
$scrubif
[
'if'
]
!=
"l2tp"
)
$mssclamp
=
"max-mss "
.
(
intval
(
$scrubcfg
[
'mss'
]
-
40
));
else
$mssclamp
=
""
;
if
(
isset
(
$scrubcfg
[
'if'
]))
{
if
(
$scrubcfg
[
'mss'
]
!=
''
&&
is_numeric
(
$scrubcfg
[
'mss'
])
&&
$scrubcfg
[
'if'
]
!=
'pppoe'
&&
$scrubcfg
[
'if'
]
!=
'pptp'
&&
$scrubif
[
'if'
]
!=
'l2tp'
)
{
$mssclamp
=
"max-mss "
.
(
intval
(
$scrubcfg
[
'mss'
]
-
40
));
}
else
{
$mssclamp
=
''
;
}
}
/* configure no-df for linux nfs and others */
if
(
!
empty
(
$config
[
'system'
][
'scrubnodf'
]))
$scrubnodf
=
"no-df"
;
...
...
src/www/diag_packet_capture.php
View file @
e8496219
...
...
@@ -87,10 +87,13 @@ $protos = array('icmp', 'icmp6', 'tcp', 'udp', 'arp', 'carp', 'esp',
$input_errors
=
array
();
$interfaces
=
get_configured_interface_with_descr
();
if
(
isset
(
$config
[
'ipsec'
][
'enable'
]))
$interfaces
[
'ipsec'
]
=
"IPsec"
;
if
(
isset
(
$config
[
'ipsec'
][
'enable'
]))
{
$interfaces
[
'ipsec'
]
=
'IPsec'
;
}
foreach
(
array
(
'server'
,
'client'
)
as
$mode
)
{
if
(
is
_array
(
$config
[
'openvpn'
][
"openvpn-
{
$mode
}
"
]))
{
if
(
is
set
(
$config
[
'openvpn'
][
"openvpn-
{
$mode
}
"
]))
{
foreach
(
$config
[
'openvpn'
][
"openvpn-
{
$mode
}
"
]
as
$id
=>
$setting
)
{
if
(
!
isset
(
$setting
[
'disable'
]))
{
$interfaces
[
'ovpn'
.
substr
(
$mode
,
0
,
1
)
.
$setting
[
'vpnid'
]]
=
gettext
(
"OpenVPN"
)
.
" "
.
$mode
.
": "
.
htmlspecialchars
(
$setting
[
'description'
]);
...
...
src/www/interfaces_gif.php
View file @
e8496219
...
...
@@ -29,8 +29,9 @@
require_once
(
"guiconfig.inc"
);
require_once
(
"interfaces.inc"
);
if
(
!
is
_array
(
$config
[
'gifs'
][
'gif'
]))
if
(
!
is
set
(
$config
[
'gifs'
][
'gif'
]))
{
$config
[
'gifs'
][
'gif'
]
=
array
();
}
$a_gifs
=
&
$config
[
'gifs'
][
'gif'
]
;
...
...
src/www/interfaces_ppps_edit.php
View file @
e8496219
...
...
@@ -39,11 +39,11 @@ define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
define
(
"CRON_DAILY_PATTERN"
,
"0 0 * * *"
);
define
(
"CRON_HOURLY_PATTERN"
,
"0 * * * *"
);
if
(
!
is
_array
(
$config
[
'ppps'
]))
{
if
(
!
is
set
(
$config
[
'ppps'
]))
{
$config
[
'ppps'
]
=
array
();
}
if
(
!
is
_array
(
$config
[
'ppps'
][
'ppp'
]))
{
if
(
!
is
set
(
$config
[
'ppps'
][
'ppp'
]))
{
$config
[
'ppps'
][
'ppp'
]
=
array
();
}
...
...
@@ -53,7 +53,7 @@ $iflist = get_configured_interface_with_descr();
$portlist
=
get_interface_list
();
$portlist
=
array_merge
(
$portlist
,
$iflist
);
if
(
is
_array
(
$config
[
'vlans'
][
'vlan'
])
&&
coun
t
(
$config
[
'vlans'
][
'vlan'
]))
{
if
(
is
se
t
(
$config
[
'vlans'
][
'vlan'
]))
{
foreach
(
$config
[
'vlans'
][
'vlan'
]
as
$vlan
)
{
$portlist
[
$vlan
[
'vlanif'
]]
=
$vlan
;
}
...
...
@@ -156,8 +156,9 @@ if (isset($id) && $a_ppps[$id]) {
break
;
}
}
else
}
else
{
$pconfig
[
'ptpid'
]
=
interfaces_ptpid_next
();
}
if
(
$_POST
)
{
...
...
@@ -444,7 +445,10 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
</tr>
<tr
style=
"display:none"
name=
"portlists"
id=
"portlists"
>
<td
id=
"serialports"
>
<?php
$selected_ports
=
explode
(
','
,
$pconfig
[
'interfaces'
]);
$selected_ports
=
array
();
if
(
isset
(
$pconfig
[
'interfaces'
]))
{
$selected_ports
=
explode
(
','
,
isset
(
$pconfig
[
'interfaces'
]));
}
if
(
!
is_dir
(
'/var/spool/lock'
))
{
mwexec
(
'/bin/mkdir -p /var/spool/lock'
);
}
...
...
src/www/services_dhcp_relay.php
View file @
e8496219
...
...
@@ -33,11 +33,16 @@ require_once("pfsense-utils.inc");
require_once
(
"interfaces.inc"
);
$pconfig
[
'enable'
]
=
isset
(
$config
[
'dhcrelay'
][
'enable'
]);
if
(
empty
(
$config
[
'dhcrelay'
][
'interface'
]))
if
(
empty
(
$config
[
'dhcrelay'
][
'interface'
]))
{
$pconfig
[
'interface'
]
=
array
();
else
}
else
{
$pconfig
[
'interface'
]
=
explode
(
","
,
$config
[
'dhcrelay'
][
'interface'
]);
$pconfig
[
'server'
]
=
$config
[
'dhcrelay'
][
'server'
];
}
if
(
!
isset
(
$config
[
'dhcrelay'
][
'server'
]))
{
$pconfig
[
'server'
]
=
array
();
}
else
{
$pconfig
[
'server'
]
=
$config
[
'dhcrelay'
][
'server'
];
}
$pconfig
[
'agentoption'
]
=
isset
(
$config
[
'dhcrelay'
][
'agentoption'
]);
$iflist
=
get_configured_interface_with_descr
();
...
...
src/www/services_dyndns_edit.php
View file @
e8496219
...
...
@@ -42,7 +42,7 @@ function is_dyndns_username($uname) {
return
true
;
}
if
(
!
is
_array
(
$config
[
'dyndnses'
][
'dyndns'
]))
{
if
(
!
is
set
(
$config
[
'dyndnses'
][
'dyndns'
]))
{
$config
[
'dyndnses'
][
'dyndns'
]
=
array
();
}
...
...
src/www/vpn_openvpn_export_shared.php
View file @
e8496219
...
...
@@ -36,7 +36,7 @@ require_once("openvpn-client-export.inc");
$pgtitle
=
array
(
"OpenVPN"
,
"Client Export Utility"
);
if
(
!
is
_array
(
$config
[
'openvpn'
][
'openvpn-server'
]))
{
if
(
!
is
set
(
$config
[
'openvpn'
][
'openvpn-server'
]))
{
$config
[
'openvpn'
][
'openvpn-server'
]
=
array
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment