| hastd.c (220899) | hastd.c (221076) |
|---|---|
| 1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net> 4 * All rights reserved. 5 * 6 * This software was developed by Pawel Jakub Dawidek under sponsorship from 7 * the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2009-2010 The FreeBSD Foundation 3 * Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net> 4 * All rights reserved. 5 * 6 * This software was developed by Pawel Jakub Dawidek under sponsorship from 7 * the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> |
| 32__FBSDID("$FreeBSD: head/sbin/hastd/hastd.c 220899 2011-04-20 18:49:12Z pjd $"); | 32__FBSDID("$FreeBSD: head/sbin/hastd/hastd.c 221076 2011-04-26 19:38:30Z trociny $"); |
| 33 34#include <sys/param.h> 35#include <sys/linker.h> 36#include <sys/module.h> 37#include <sys/stat.h> 38#include <sys/wait.h> 39 40#include <err.h> --- 378 unchanged lines hidden (view full) --- 419resource_reload(const struct hast_resource *res) 420{ 421 struct nv *nvin, *nvout; 422 int error; 423 424 PJDLOG_ASSERT(res->hr_role == HAST_ROLE_PRIMARY); 425 426 nvout = nv_alloc(); | 33 34#include <sys/param.h> 35#include <sys/linker.h> 36#include <sys/module.h> 37#include <sys/stat.h> 38#include <sys/wait.h> 39 40#include <err.h> --- 378 unchanged lines hidden (view full) --- 419resource_reload(const struct hast_resource *res) 420{ 421 struct nv *nvin, *nvout; 422 int error; 423 424 PJDLOG_ASSERT(res->hr_role == HAST_ROLE_PRIMARY); 425 426 nvout = nv_alloc(); |
| 427 nv_add_uint8(nvout, HASTCTL_RELOAD, "cmd"); | 427 nv_add_uint8(nvout, CONTROL_RELOAD, "cmd"); |
| 428 nv_add_string(nvout, res->hr_remoteaddr, "remoteaddr"); 429 nv_add_string(nvout, res->hr_sourceaddr, "sourceaddr"); 430 nv_add_int32(nvout, (int32_t)res->hr_replication, "replication"); 431 nv_add_int32(nvout, (int32_t)res->hr_checksum, "checksum"); 432 nv_add_int32(nvout, (int32_t)res->hr_compression, "compression"); 433 nv_add_int32(nvout, (int32_t)res->hr_timeout, "timeout"); 434 nv_add_string(nvout, res->hr_exec, "exec"); 435 if (nv_error(nvout) != 0) { --- 731 unchanged lines hidden --- | 428 nv_add_string(nvout, res->hr_remoteaddr, "remoteaddr"); 429 nv_add_string(nvout, res->hr_sourceaddr, "sourceaddr"); 430 nv_add_int32(nvout, (int32_t)res->hr_replication, "replication"); 431 nv_add_int32(nvout, (int32_t)res->hr_checksum, "checksum"); 432 nv_add_int32(nvout, (int32_t)res->hr_compression, "compression"); 433 nv_add_int32(nvout, (int32_t)res->hr_timeout, "timeout"); 434 nv_add_string(nvout, res->hr_exec, "exec"); 435 if (nv_error(nvout) != 0) { --- 731 unchanged lines hidden --- |