Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
4e2942a6
Commit
4e2942a6
authored
Mar 11, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewrite CLI/Telnet in terms of suckaddrs
parent
ee0910af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
30 deletions
+30
-30
mgt_cli.c
bin/varnishd/mgt/mgt_cli.c
+30
-30
No files found.
bin/varnishd/mgt/mgt_cli.c
View file @
4e2942a6
...
@@ -512,51 +512,51 @@ mgt_cli_secret(const char *S_arg)
...
@@ -512,51 +512,51 @@ mgt_cli_secret(const char *S_arg)
secret_file
=
S_arg
;
secret_file
=
S_arg
;
}
}
void
static
int
__match_proto__
(
vss_resolver_f
)
m
gt_cli_telnet
(
const
char
*
T_arg
)
m
ct_callback
(
void
*
priv
,
const
struct
suckaddr
*
sa
)
{
{
struct
vss_addr
**
ta
;
int
sock
;
int
i
,
n
,
sock
,
good
;
struct
vsb
*
vsb
=
priv
;
struct
telnet
*
tn
;
const
char
*
err
;
struct
vsb
*
vsb
;
char
abuf
[
VTCP_ADDRBUFSIZE
];
char
abuf
[
VTCP_ADDRBUFSIZE
];
char
pbuf
[
VTCP_PORTBUFSIZE
];
char
pbuf
[
VTCP_PORTBUFSIZE
];
struct
telnet
*
tn
;
AN
(
T_arg
);
VJ_master
(
JAIL_MASTER_HIGH
);
n
=
VSS_resolve
(
T_arg
,
NULL
,
&
ta
);
sock
=
VTCP_listen
(
sa
,
10
,
&
err
);
if
(
n
==
0
)
{
VJ_master
(
JAIL_MASTER_LOW
);
REPORT
(
LOG_ERR
,
"-T %s Could not be resolved
\n
"
,
T_arg
);
if
(
sock
>
0
)
{
exit
(
2
);
}
good
=
0
;
vsb
=
VSB_new_auto
();
XXXAN
(
vsb
);
for
(
i
=
0
;
i
<
n
;
++
i
)
{
VJ_master
(
JAIL_MASTER_HIGH
);
sock
=
VSS_listen
(
ta
[
i
],
10
);
VJ_master
(
JAIL_MASTER_LOW
);
if
(
sock
<
0
)
continue
;
VTCP_myname
(
sock
,
abuf
,
sizeof
abuf
,
pbuf
,
sizeof
pbuf
);
VTCP_myname
(
sock
,
abuf
,
sizeof
abuf
,
pbuf
,
sizeof
pbuf
);
VSB_printf
(
vsb
,
"%s %s
\n
"
,
abuf
,
pbuf
);
VSB_printf
(
vsb
,
"%s %s
\n
"
,
abuf
,
pbuf
);
good
++
;
tn
=
telnet_new
(
sock
);
tn
=
telnet_new
(
sock
);
tn
->
ev
=
vev_new
();
tn
->
ev
=
vev_new
();
XXX
AN
(
tn
->
ev
);
AN
(
tn
->
ev
);
tn
->
ev
->
fd
=
sock
;
tn
->
ev
->
fd
=
sock
;
tn
->
ev
->
fd_flags
=
POLLIN
;
tn
->
ev
->
fd_flags
=
POLLIN
;
tn
->
ev
->
callback
=
telnet_accept
;
tn
->
ev
->
callback
=
telnet_accept
;
tn
->
ev
->
priv
=
tn
;
tn
->
ev
->
priv
=
tn
;
AZ
(
vev_add
(
mgt_evb
,
tn
->
ev
));
AZ
(
vev_add
(
mgt_evb
,
tn
->
ev
));
free
(
ta
[
i
]);
ta
[
i
]
=
NULL
;
}
free
(
ta
);
if
(
good
==
0
)
{
REPORT
(
LOG_ERR
,
"-T %s could not be listened on."
,
T_arg
);
exit
(
2
);
}
}
return
(
0
);
}
void
mgt_cli_telnet
(
const
char
*
T_arg
)
{
int
error
;
const
char
*
err
;
struct
vsb
*
vsb
;
AN
(
T_arg
);
vsb
=
VSB_new_auto
();
AN
(
vsb
);
error
=
VSS_resolver
(
T_arg
,
NULL
,
mct_callback
,
vsb
,
&
err
);
if
(
err
!=
NULL
)
ARGV_ERR
(
"Could resolve -T argument to address
\n\t
%s
\n
"
,
err
);
AZ
(
error
);
AZ
(
VSB_finish
(
vsb
));
AZ
(
VSB_finish
(
vsb
));
if
(
VSB_len
(
vsb
)
==
0
)
ARGV_ERR
(
"-T %s could not be listened on."
,
T_arg
);
/* Save in shmem */
/* Save in shmem */
mgt_SHM_static_alloc
(
VSB_data
(
vsb
),
VSB_len
(
vsb
)
+
1
,
"Arg"
,
"-T"
,
""
);
mgt_SHM_static_alloc
(
VSB_data
(
vsb
),
VSB_len
(
vsb
)
+
1
,
"Arg"
,
"-T"
,
""
);
VSB_delete
(
vsb
);
VSB_delete
(
vsb
);
...
...
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