Skip to content

Commit 4d7a938

Browse files
committed
net/frr: some small style updates while here
1 parent 290c67d commit 4d7a938

3 files changed

Lines changed: 23 additions & 28 deletions

File tree

net/frr/src/etc/rc.syshook.d/start/50-frr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ require_once('util.inc');
3333
require_once('plugins.inc.d/frr.inc');
3434

3535
if (frr_enabled()) {
36-
shell_exec('/usr/local/opnsense/scripts/frr/carp_event_handler');
36+
mwexecfm('/usr/local/opnsense/scripts/frr/carp_event_handler');
3737
}

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,37 @@
11
<?php
22

33
/*
4-
* Copyright (C) 2015-2024 Deciso B.V.
5-
* Copyright (C) 2015 Jos Schellevis <jos@opnsense.org>
6-
* Copyright (C) 2017 Fabian Franz
7-
* Copyright (C) 2017 Michael Muenz <m.muenz@gmail.com>
8-
* All rights reserved.
4+
* Copyright (C) 2015-2024 Deciso B.V.
5+
* Copyright (C) 2015 Jos Schellevis <jos@opnsense.org>
6+
* Copyright (C) 2017 Fabian Franz
7+
* Copyright (C) 2017 Michael Muenz <m.muenz@gmail.com>
8+
* All rights reserved.
99
*
10-
* Redistribution and use in source and binary forms, with or without
11-
* modification, are permitted provided that the following conditions are met:
10+
* Redistribution and use in source and binary forms, with or without
11+
* modification, are permitted provided that the following conditions are met:
1212
*
13-
* 1. Redistributions of source code must retain the above copyright notice,
14-
* this list of conditions and the following disclaimer.
13+
* 1. Redistributions of source code must retain the above copyright notice,
14+
* this list of conditions and the following disclaimer.
1515
*
16-
* 2. Redistributions in binary form must reproduce the above copyright
17-
* notice, this list of conditions and the following disclaimer in the
18-
* documentation and/or other materials provided with the distribution.
16+
* 2. Redistributions in binary form must reproduce the above copyright
17+
* notice, this list of conditions and the following disclaimer in the
18+
* documentation and/or other materials provided with the distribution.
1919
*
20-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
21-
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
22-
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
23-
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
24-
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25-
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26-
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27-
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29-
* POSSIBILITY OF SUCH DAMAGE.
20+
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
21+
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
22+
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
23+
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
24+
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29+
* POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131

3232
namespace OPNsense\Quagga\Api;
3333

34-
use OPNsense\Quagga\OSPF6;
35-
use OPNsense\Core\Config;
3634
use OPNsense\Base\ApiMutableModelControllerBase;
37-
use OPNsense\Base\UIModelGrid;
3835

3936
class Ospf6settingsController extends ApiMutableModelControllerBase
4037
{

net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BFD.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
<Required>Y</Required>
2323
</multihop>
2424
<localaddress type="NetworkField">
25-
<Required>N</Required>
2625
<NetMaskAllowed>N</NetMaskAllowed>
2726
</localaddress>
2827
<interfacename type="InterfaceField">
29-
<Required>N</Required>
3028
<AllowDynamic>Y</AllowDynamic>
3129
<filters>
3230
<enable>/^(?!0).*$/</enable>

0 commit comments

Comments
 (0)