diff options
| -rw-r--r-- | qacp.c | 4 | ||||
| -rw-r--r-- | qarsh.c | 4 | ||||
| -rw-r--r-- | sockutil.c | 5 |
3 files changed, 4 insertions, 9 deletions
@@ -51,7 +51,6 @@ int qacp_fd = -1; /* The control connection to qacpd */ unsigned short qarsh_ss_family; /* AF_INET/AF_INET6, set on connect */ short quiet = 0; -int packet_seq = 1; void usage() @@ -72,7 +71,6 @@ set_remote_user(char *user, char *group) struct qa_packet *qp; qp = make_qp_setuser(user, group); - qp->qp_seq = packet_seq++; send_packet(qacp_fd, qp); qpfree(qp); qp = recv_packet(qacp_fd); @@ -97,7 +95,6 @@ qacp_rstat(const char *rmtpath, int *rstaterrno) struct qp_rstat_pkt *rstatp; qp = make_qp_rstat(rmtpath, NULL); - qp->qp_seq = packet_seq++; send_packet(qacp_fd, qp); qpfree(qp); @@ -262,7 +259,6 @@ qacp_recvonefile(const char *host, const char *srcfile, const char *destfile) * qarshd to send a file. */ qp = make_qp_sendfile(srcfile, port); - qp->qp_seq = packet_seq++; send_packet(qacp_fd, qp); qpfree(qp); @@ -57,7 +57,6 @@ int signal_to_send = 0; int sigs_to_propogate[] = { SIGINT, SIGTERM, SIGHUP, SIGUSR1, SIGUSR2 }; sigset_t pselect_sigmask; int connection_timeout = 0; -int packet_seq = 1; void usage() @@ -160,7 +159,6 @@ set_remote_user(char *user, char *group) int ret; qp = make_qp_setuser(user, group); - qp->qp_seq = packet_seq++; ret = send_packet(qarsh_fd, qp); qpfree(qp); if (ret <= 0) { @@ -208,7 +206,6 @@ run_remote_cmd(char *cmdline) p_err = getsockport(l_err); qp = make_qp_runcmd(cmdline, p_in, p_out, p_err); - qp->qp_seq = packet_seq++; send_packet(qarsh_fd, qp); qpfree(qp); @@ -317,7 +314,6 @@ run_remote_cmd(char *cmdline) /* Only test signals */ if (signal_to_send) { qp = make_qp_kill(signal_to_send); - qp->qp_seq = packet_seq++; send_packet(qarsh_fd, qp); qpfree(qp); signal_to_send = 0; @@ -32,6 +32,7 @@ #include "qarsh_packet.h" +static int packet_seq = 1; /* Some generic socket related functions to make things easier */ int @@ -255,11 +256,13 @@ recv_read: int send_packet(int fd, struct qa_packet *qp) { - Buffer pb = { "", 0, 0}; + Buffer pb = { "", 0, 0 }; uint32_t netsize; ssize_t ret = -1; struct iovec iovs[2]; + qp->qp_seq = packet_seq++; + pb.end = qptostr(qp, pb.buf, QARSH_MAX_PACKET_SIZE - sizeof netsize); if (pb.end > 0) { |