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
d80be7bf
Commit
d80be7bf
authored
Mar 26, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipsec: more config amending; fixes #112
parent
2d86dbfb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
16 deletions
+34
-16
diag_ipsec.php
src/www/diag_ipsec.php
+7
-2
diag_ipsec_xml.php
src/www/diag_ipsec_xml.php
+6
-1
vpn_ipsec.php
src/www/vpn_ipsec.php
+4
-2
vpn_ipsec_mobile.php
src/www/vpn_ipsec_mobile.php
+6
-4
vpn_ipsec_phase1.php
src/www/vpn_ipsec_phase1.php
+6
-3
vpn_ipsec_phase2.php
src/www/vpn_ipsec_phase2.php
+5
-4
No files found.
src/www/diag_ipsec.php
View file @
d80be7bf
<?php
<?php
/* $Id$ */
/*
/*
Copyright (C) 2014 Deciso B.V.
Copyright (C) 2014 Deciso B.V.
Copyright (C) 2004-2009 Scott Ullrich
Copyright (C) 2004-2009 Scott Ullrich
...
@@ -57,8 +57,13 @@ if ($_GET['act'] == 'connect') {
...
@@ -57,8 +57,13 @@ if ($_GET['act'] == 'connect') {
}
}
}
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
if
(
!
is_array
(
$config
[
'ipsec'
]))
{
$config
[
'ipsec'
]
=
array
();
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
{
$config
[
'ipsec'
][
'phase1'
]
=
array
();
$config
[
'ipsec'
][
'phase1'
]
=
array
();
}
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
...
...
src/www/diag_ipsec_xml.php
View file @
d80be7bf
...
@@ -33,8 +33,13 @@ global $g;
...
@@ -33,8 +33,13 @@ global $g;
require_once
(
"guiconfig.inc"
);
require_once
(
"guiconfig.inc"
);
require_once
(
"ipsec.inc"
);
require_once
(
"ipsec.inc"
);
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
if
(
!
is_array
(
$config
[
'ipsec'
]))
{
$config
[
'ipsec'
]
=
array
();
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
{
$config
[
'ipsec'
][
'phase2'
]
=
array
();
$config
[
'ipsec'
][
'phase2'
]
=
array
();
}
$ipsec_status
=
array
();
$ipsec_status
=
array
();
...
...
src/www/vpn_ipsec.php
View file @
d80be7bf
...
@@ -38,11 +38,13 @@ if (!is_array($config['ipsec'])) {
...
@@ -38,11 +38,13 @@ if (!is_array($config['ipsec'])) {
$config
[
'ipsec'
]
=
array
();
$config
[
'ipsec'
]
=
array
();
}
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
{
$config
[
'ipsec'
][
'phase1'
]
=
array
();
$config
[
'ipsec'
][
'phase1'
]
=
array
();
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
{
$config
[
'ipsec'
][
'phase2'
]
=
array
();
$config
[
'ipsec'
][
'phase2'
]
=
array
();
}
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
$a_phase2
=
&
$config
[
'ipsec'
][
'phase2'
];
$a_phase2
=
&
$config
[
'ipsec'
][
'phase2'
];
...
...
src/www/vpn_ipsec_mobile.php
View file @
d80be7bf
<?php
<?php
/*
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2008 Shrew Soft Inc
Copyright (C) 2008 Shrew Soft Inc
...
@@ -35,14 +36,15 @@ if (!is_array($config['ipsec'])) {
...
@@ -35,14 +36,15 @@ if (!is_array($config['ipsec'])) {
$config
[
'ipsec'
]
=
array
();
$config
[
'ipsec'
]
=
array
();
}
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
{
$config
[
'ipsec'
][
'phase1'
]
=
array
();
$config
[
'ipsec'
][
'phase1'
]
=
array
();
}
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
if
(
!
is_array
(
$config
[
'ipsec'
][
'client'
]))
{
if
(
!
is_array
(
$config
[
'ipsec'
][
'client'
]))
$config
[
'ipsec'
][
'client'
]
=
array
();
$config
[
'ipsec'
][
'client'
]
=
array
();
}
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
$a_client
=
&
$config
[
'ipsec'
][
'client'
];
$a_client
=
&
$config
[
'ipsec'
][
'client'
];
if
(
count
(
$a_client
))
{
if
(
count
(
$a_client
))
{
...
...
src/www/vpn_ipsec_phase1.php
View file @
d80be7bf
<?php
<?php
/*
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2008 Shrew Soft Inc
Copyright (C) 2008 Shrew Soft Inc
Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
Copyright (C) 2014 Ermal L
UÇI
Copyright (C) 2014 Ermal L
uçi
All rights reserved.
All rights reserved.
Redistribution and use in source and binary forms, with or without
Redistribution and use in source and binary forms, with or without
...
@@ -37,11 +38,13 @@ if (!is_array($config['ipsec'])) {
...
@@ -37,11 +38,13 @@ if (!is_array($config['ipsec'])) {
$config
[
'ipsec'
]
=
array
();
$config
[
'ipsec'
]
=
array
();
}
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase1'
]))
{
$config
[
'ipsec'
][
'phase1'
]
=
array
();
$config
[
'ipsec'
][
'phase1'
]
=
array
();
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
{
$config
[
'ipsec'
][
'phase2'
]
=
array
();
$config
[
'ipsec'
][
'phase2'
]
=
array
();
}
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
$a_phase1
=
&
$config
[
'ipsec'
][
'phase1'
];
$a_phase2
=
&
$config
[
'ipsec'
][
'phase2'
];
$a_phase2
=
&
$config
[
'ipsec'
][
'phase2'
];
...
...
src/www/vpn_ipsec_phase2.php
View file @
d80be7bf
...
@@ -36,14 +36,15 @@ if (!is_array($config['ipsec'])) {
...
@@ -36,14 +36,15 @@ if (!is_array($config['ipsec'])) {
$config
[
'ipsec'
]
=
array
();
$config
[
'ipsec'
]
=
array
();
}
}
if
(
!
is_array
(
$config
[
'ipsec'
][
'client'
]))
if
(
!
is_array
(
$config
[
'ipsec'
][
'client'
]))
{
$config
[
'ipsec'
][
'client'
]
=
array
();
$config
[
'ipsec'
][
'client'
]
=
array
();
}
$a_client
=
&
$config
[
'ipsec'
][
'client'
];
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
{
if
(
!
is_array
(
$config
[
'ipsec'
][
'phase2'
]))
$config
[
'ipsec'
][
'phase2'
]
=
array
();
$config
[
'ipsec'
][
'phase2'
]
=
array
();
}
$a_client
=
&
$config
[
'ipsec'
][
'client'
];
$a_phase2
=
&
$config
[
'ipsec'
][
'phase2'
];
$a_phase2
=
&
$config
[
'ipsec'
][
'phase2'
];
if
(
!
empty
(
$_GET
[
'p2index'
]))
if
(
!
empty
(
$_GET
[
'p2index'
]))
...
...
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