#define UNIX_PATH_MAX 108
/* Also in guestfsd.c */
-#define VMCHANNEL_PORT 6666
-#define VMCHANNEL_ADDR "10.0.2.4"
+#define GUESTFWD_PORT 6666
+//#define GUESTFWD_ADDR "10.0.2.4"
/* GuestFS handle and connection. */
enum state { CONFIG, LAUNCHING, READY, BUSY, NO_HANDLE };
/* Linux kernel command line. */
snprintf (append, sizeof append,
LINUX_CMDLINE
- "guestfs=%s:%d "
"%s" /* (selinux) */
"%s" /* (verbose) */
"%s", /* (append) */
- VMCHANNEL_ADDR, VMCHANNEL_PORT,
g->selinux ? "selinux=1 enforcing=0 " : "selinux=0 ",
g->verbose ? "guestfs_verbose=1 " : " ",
g->append ? g->append : "");
*/
snprintf (vmchannel, sizeof vmchannel,
"user,vlan=0,net=10.0.2.0/8,guestfwd=tcp:%s:%d-unix:%s,server,nowait",
- VMCHANNEL_ADDR, VMCHANNEL_PORT, unixsock);
+ GUESTFWD_ADDR, GUESTFWD_PORT, unixsock);
add_cmdline (g, "-net");
add_cmdline (g, vmchannel);
*/
snprintf (vmchannel, sizeof vmchannel,
"channel,%d:unix:%s,server,nowait",
- VMCHANNEL_PORT, unixsock);
+ GUESTFWD_PORT, unixsock);
add_cmdline (g, "-net");
add_cmdline (g, vmchannel);
*/
ssize_t nr = -4;
- while (nr < *size_rtn) {
+ while (nr < (ssize_t) *size_rtn) {
rset2 = rset;
int r = select (max_fd+1, &rset2, NULL, NULL, NULL);
if (r == -1) {
}
/* Got the full message, caller can start processing it. */
-#if 0
+#ifdef ENABLE_PACKET_DUMP
if (g->verbose) {
- size_t i, j;
+ ssize_t i, j;
for (i = 0; i < nr; i += 16) {
- printf ("%04x: ", i);
+ printf ("%04zx: ", i);
for (j = i; j < MIN (i+16, nr); ++j)
- printf ("%02x ", (unsigned char) (*buf_rtn)[j]);
+ printf ("%02x ", (*(unsigned char **)buf_rtn)[j]);
for (; j < i+16; ++j)
printf (" ");
printf ("|");
- for (j = i; j < MIN (i+16, g->nr); ++j)
- if (isprint ((*buf_rtn)[j]))
- printf ("%c", (*buf_rtn)[j]);
+ for (j = i; j < MIN (i+16, nr); ++j)
+ if (isprint ((*(char **)buf_rtn)[j]))
+ printf ("%c", (*(char **)buf_rtn)[j]);
else
printf (".");
for (; j < i+16; ++j)