Project

General

Profile

« Previous | Next » 

Revision c5d8cbe0

Added by Chris Buechler over 9 years ago

Background all the ipsec commands run from status_ipsec.php to make sure they don't hang up the entire GUI. Ticket #5520

View differences:

src/usr/local/www/status_ipsec.php
82 82
				$ph2entries = ipsec_get_number_of_phase2($_GET['ikeid']);
83 83
				for ($i = 0; $i < $ph2entries; $i++) {
84 84
					$connid = escapeshellarg("con{$_GET['ikeid']}00{$i}");
85
					mwexec("/usr/local/sbin/ipsec down {$connid}");
85
					mwexec_bg("/usr/local/sbin/ipsec down {$connid}");
86 86
					mwexec_bg("/usr/local/sbin/ipsec up {$connid}");
87 87
				}
88 88
			} else {
89
				mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']));
89
				mwexec_bg("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']));
90 90
				mwexec_bg("/usr/local/sbin/ipsec up con" . escapeshellarg($_GET['ikeid']));
91 91
			}
92 92
		}
......
94 94
} else if ($_GET['act'] == 'ikedisconnect') {
95 95
	if (ctype_digit($_GET['ikeid'])) {
96 96
		if (!empty($_GET['ikesaid']) && ctype_digit($_GET['ikesaid'])) {
97
			mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']) . "[" . escapeshellarg($_GET['ikesaid']) . "]");
97
			mwexec_bg("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']) . "[" . escapeshellarg($_GET['ikesaid']) . "]");
98 98
		} else {
99
			mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']));
99
			mwexec_bg("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']));
100 100
		}
101 101
	}
102 102
} else if ($_GET['act'] == 'childdisconnect') {
103 103
	if (ctype_digit($_GET['ikeid'])) {
104 104
		if (!empty($_GET['ikesaid']) && ctype_digit($_GET['ikesaid'])) {
105
			mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']) . "{" . escapeshellarg($_GET['ikesaid']) . "}");
105
			mwexec_bg("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']) . "{" . escapeshellarg($_GET['ikesaid']) . "}");
106 106
		}
107 107
	}
108 108
}

Also available in: Unified diff