Deleted Added
full compact
connect.c (53913) connect.c (125011)
1
2/*
3 * connect.c
4 *
5 * Copyright (c) 1996-1999 Whistle Communications, Inc.
6 * All rights reserved.
7 *
8 * Subject to the following obligations and disclaimer of warranty, use and
9 * redistribution of this software, in source or object code forms, with or
10 * without modifications are expressly permitted by Whistle Communications;
11 * provided, however, that:
12 * 1. Any and all reproductions of the source or object code must include the
13 * copyright notice above and the following disclaimer of warranties; and
14 * 2. No rights are granted, in any manner or form, to use Whistle
15 * Communications, Inc. trademarks, including the mark "WHISTLE
16 * COMMUNICATIONS" on advertising, endorsements, or otherwise except as
17 * such appears in the above copyright notice or in the software.
18 *
19 * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
20 * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
21 * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
22 * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
23 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
24 * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
25 * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
26 * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
27 * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
28 * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
29 * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
30 * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
31 * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
35 * OF SUCH DAMAGE.
36 *
1
2/*
3 * connect.c
4 *
5 * Copyright (c) 1996-1999 Whistle Communications, Inc.
6 * All rights reserved.
7 *
8 * Subject to the following obligations and disclaimer of warranty, use and
9 * redistribution of this software, in source or object code forms, with or
10 * without modifications are expressly permitted by Whistle Communications;
11 * provided, however, that:
12 * 1. Any and all reproductions of the source or object code must include the
13 * copyright notice above and the following disclaimer of warranties; and
14 * 2. No rights are granted, in any manner or form, to use Whistle
15 * Communications, Inc. trademarks, including the mark "WHISTLE
16 * COMMUNICATIONS" on advertising, endorsements, or otherwise except as
17 * such appears in the above copyright notice or in the software.
18 *
19 * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
20 * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
21 * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
22 * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
23 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
24 * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
25 * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
26 * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
27 * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
28 * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
29 * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
30 * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
31 * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
35 * OF SUCH DAMAGE.
36 *
37 * $FreeBSD: head/usr.sbin/ngctl/connect.c 53913 1999-11-30 02:45:32Z archie $
37 * $FreeBSD: head/usr.sbin/ngctl/connect.c 125011 2004-01-26 10:27:18Z ru $
38 */
39
40#include "ngctl.h"
41
42static int ConnectCmd(int ac, char **av);
43
44const struct ngcmd connect_cmd = {
45 ConnectCmd,
46 "connect [path] <relpath> <hook> <peerhook>",
47 "Connects hook <peerhook> of the node at <relpath> to <hook>",
48 "The connect command creates a link between the two nodes at"
49 " \"path\" and \"relpath\" using hooks \"hook\" and \"peerhook\","
50 " respectively. The \"relpath\", if not absolute, is specified"
51 " relative to the node at \"path\"."
52 " If \"path\" is omitted then \".\" is assumed.",
53 { "join" }
54};
55
56static int
57ConnectCmd(int ac, char **av)
58{
59 struct ngm_connect con;
38 */
39
40#include "ngctl.h"
41
42static int ConnectCmd(int ac, char **av);
43
44const struct ngcmd connect_cmd = {
45 ConnectCmd,
46 "connect [path] <relpath> <hook> <peerhook>",
47 "Connects hook <peerhook> of the node at <relpath> to <hook>",
48 "The connect command creates a link between the two nodes at"
49 " \"path\" and \"relpath\" using hooks \"hook\" and \"peerhook\","
50 " respectively. The \"relpath\", if not absolute, is specified"
51 " relative to the node at \"path\"."
52 " If \"path\" is omitted then \".\" is assumed.",
53 { "join" }
54};
55
56static int
57ConnectCmd(int ac, char **av)
58{
59 struct ngm_connect con;
60 char *path = ".";
60 const char *path = ".";
61
62 /* Get arguments */
63 switch (ac) {
64 case 5:
65 path = av[1];
66 ac--;
67 av++;
68 /* FALLTHROUGH */
69 case 4:
70 snprintf(con.path, sizeof(con.path), "%s", av[1]);
71 snprintf(con.ourhook, sizeof(con.ourhook), "%s", av[2]);
72 snprintf(con.peerhook, sizeof(con.peerhook), "%s", av[3]);
73 break;
74 default:
75 return(CMDRTN_USAGE);
76 }
77
78 /* Send message */
79 if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE,
80 NGM_CONNECT, &con, sizeof(con)) < 0) {
81 warn("send msg");
82 return(CMDRTN_ERROR);
83 }
84 return(CMDRTN_OK);
85}
86
61
62 /* Get arguments */
63 switch (ac) {
64 case 5:
65 path = av[1];
66 ac--;
67 av++;
68 /* FALLTHROUGH */
69 case 4:
70 snprintf(con.path, sizeof(con.path), "%s", av[1]);
71 snprintf(con.ourhook, sizeof(con.ourhook), "%s", av[2]);
72 snprintf(con.peerhook, sizeof(con.peerhook), "%s", av[3]);
73 break;
74 default:
75 return(CMDRTN_USAGE);
76 }
77
78 /* Send message */
79 if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE,
80 NGM_CONNECT, &con, sizeof(con)) < 0) {
81 warn("send msg");
82 return(CMDRTN_ERROR);
83 }
84 return(CMDRTN_OK);
85}
86