forked from opnsense/core
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dhcrelay: migrate IPv6 data, consolidation cleanups opnsense#6983
Menu, ACL and XMLRPC wer consolidated into the IPv4 flag. IPv6 is no longer functional and operates from the shared reimplementation now. Syslog doesn't work on OpenBSD dhcrelay especially since we start it with -d so it tries to spam to stderr which is ignored by daemon -f to background it properly with a pid file (it's a long story, don't ask).
- Loading branch information
Showing
13 changed files
with
87 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,6 @@ Copyright (c) 2009-2012 Jim Pingle <[email protected]> | |
| Copyright (c) 2012 Jonas von Andrian | ||
| Copyright (c) 2004-2005 Jonathan Watt <[email protected]> | ||
| Copyright (c) 2015 Jos Schellevis <[email protected]> | ||
| Copyright (c) 2003-2004 Justin Ellison <[email protected]> | ||
| Copyright (c) 2021 Kyle Evans <[email protected]> | ||
| Copyright (c) 2015 Manuel Faux <[email protected]> | ||
| Copyright (c) 2003-2006 Manuel Kasper <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
src/opnsense/mvc/app/models/OPNsense/DHCRelay/Migrations/M1_0_1.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * Copyright (C) 2024 Deciso B.V. | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
| * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY | ||
| * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
| * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, | ||
| * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| namespace OPNsense\DHCRelay\Migrations; | ||
|
|
||
| use OPNsense\Base\BaseModelMigration; | ||
| use OPNsense\Base\FieldTypes\BooleanField; | ||
| use OPNsense\Base\FieldTypes\NetworkField; | ||
| use OPNsense\Base\FieldTypes\PortField; | ||
| use OPNsense\Core\Config; | ||
|
|
||
| class M1_0_1 extends BaseModelMigration | ||
| { | ||
| /** | ||
| * Migrate older models into shared model | ||
| * @param $model | ||
| */ | ||
| public function run($model) | ||
| { | ||
| $config = Config::getInstance()->object(); | ||
|
|
||
| $legacy = $config->dhcrelay6; | ||
| if (empty($legacy->interface) || empty($legacy->server)) { | ||
| /* no value in partial migration so skip all */ | ||
| return; | ||
| } | ||
|
|
||
| $node = $model->destinations->add(); | ||
| $node->setNodes([ | ||
| 'name' => 'Migrated IPv6 server entry', | ||
| 'server' => (string)$legacy->server, | ||
| ]); | ||
| $dest_uuid = $node->getAttribute('uuid'); | ||
|
|
||
| foreach (explode(',', (string)$legacy->interface) as $interface) { | ||
| $node = $model->relays->add(); | ||
| $node->setNodes([ | ||
| 'agent_info' => !empty($legacy->agentoption) ? '1' : '0', | ||
| 'enabled' => !empty($legacy->enable) ? '1' : '0', | ||
| 'interface' => (string)$interface, | ||
| 'destination' => $dest_uuid, | ||
| ]); | ||
| $node->interface->normalizeValue(); | ||
| if (empty((string)$node->interface)) { | ||
| $model->relays->del($node->getAttribute('uuid')); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public function post($model) | ||
| { | ||
| $config = Config::getInstance()->object(); | ||
| unset($config->dhcrelay6); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.