old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fri May 19 16:46:02 2006 Michael Jennings (mej) 

Fixed a problem that's been bugging me for ages:  Instead of a
hard-coded delay, wait until we can connect to the ssh forwarding port
before starting the Escreen session via ssh.

Add usleep() to system() wait so as to not peg the CPU while sitting
and spinning.
----------------------------------------------------------------------


SVN revision: 22752
This commit is contained in:
Michael Jennings 2006-05-19 20:45:42 +00:00
parent cc5392df86
commit 6c1e5b3b6c
6 changed files with 95 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -5487,3 +5487,12 @@ Patch from Kim Woelders <kim@woelders.dk> to optimize transparent
Eterms moved an even multiple of the desktop size (i.e., to another
desktop area).
----------------------------------------------------------------------
Fri May 19 16:46:02 2006 Michael Jennings (mej)
Fixed a problem that's been bugging me for ages: Instead of a
hard-coded delay, wait until we can connect to the ssh forwarding port
before starting the Escreen session via ssh.
Add usleep() to system() wait so as to not peg the CPU while sitting
and spinning.
----------------------------------------------------------------------

11
src/command.c
View File

@ -2696,11 +2696,16 @@ err_msg(void *xd, int err, char *msg)
static int
inp_text(void *xd, int id, char *txt)
{
USE_VAR(xd);
int which = (int) xd;
USE_VAR(id);
D_ESCREEN(("Writing \"%s\" to subprocess.\n", safe_print_string(txt, strlen(txt))));
tt_write(txt, strlen(txt));
if (which) {
D_ESCREEN(("Writing \"%s\" to screen.\n", safe_print_string(txt, strlen(txt))));
cmd_write(txt, strlen(txt));
} else {
D_ESCREEN(("Writing \"%s\" to subprocess.\n", safe_print_string(txt, strlen(txt))));
tt_write(txt, strlen(txt));
}
return NS_SUCC;
}

73
src/libscream.c
View File

@ -1080,6 +1080,42 @@ ns_attach_lcl(_ns_sess ** sp)
}
static int
ns_wait_for_socket(int port)
{
int tmp_sock, ret;
time_t start_time;
D_ESCREEN(("Waiting for forwarder to begin listening on port %d.\n", port));
tmp_sock = socket(PF_INET, SOCK_STREAM, 6);
start_time = time(NULL);
if (tmp_sock > 0) {
struct sockaddr_in addr;
char timeout = 0;
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
addr.sin_port = htons(port);
do {
usleep(100);
if ((time(NULL) - start_time) >= NS_TUNNEL_DELAY) {
timeout = 1;
break;
}
} while (connect(tmp_sock, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)));
if (timeout) {
D_ESCREEN((" -> Unable to connect; timeout after %d seconds.\n", NS_TUNNEL_DELAY));
sleep(1);
return -1;
} else {
ret = time(NULL) - start_time;
D_ESCREEN((" -> Connected after %d seconds.\n", ret));
}
close(tmp_sock);
}
return ret;
}
/* attach a remote session (using screen/scream via ssh)
sp the session
@ -1115,22 +1151,36 @@ ns_attach_ssh(_ns_sess ** sp)
if (sess->hop) {
if (sess->hop->established == NS_HOP_DOWN) { /* the nightmare foe */
_ns_efuns *efuns = NULL;
ret = snprintf(cmd, NS_MAXCMD, "%s %s -p %d -L %d:%s:%d %s@%s",
NS_SSH_CALL, NS_SSH_TUNNEL_OPTS, sess->hop->fwport, sess->hop->localport, sess->host, sess->port,
sess->user, sess->hop->fw);
if (ret < 0 || ret > NS_MAXCMD)
return NS_FAIL;
D_ESCREEN(("Spawning forwarder: %s\n", cmd));
ns_run(sess->efuns, cmd);
sleep(sess->hop->delay);
if (NS_EFUN_EXISTS(efuns, sess, NULL, inp_text)) {
char tmp_buff[] = "Waiting for forwarder...";
efuns->inp_text((void *) 1, sess->fd, tmp_buff);
}
if ((ns_wait_for_socket(sess->hop->localport) < 0) && efuns) {
char tmp_buff[] = "...timed out.";
efuns->inp_text((void *) 1, sess->fd, tmp_buff);
}
}
ret = snprintf(cmd, NS_MAXCMD, "%s %s -p %d %s@localhost \"%s%s\"",
NS_SSH_CALL, NS_SSH_OPTS, sess->hop->localport, sess->user, call, ((sess->backend == NS_MODE_SCREEN)
|| (sess->backend ==
NS_MODE_NEGOTIATE)) ? esc : "");
D_ESCREEN(("Spawning screen session: %s\n", cmd));
} else {
ret =
snprintf(cmd, NS_MAXCMD, "%s %s -p %d %s@%s \"%s%s\"", NS_SSH_CALL, NS_SSH_OPTS, sess->port, sess->user, sess->host,
call, ((sess->backend == NS_MODE_SCREEN) || (sess->backend == NS_MODE_NEGOTIATE)) ? esc : "");
D_ESCREEN(("Spawning screen session: %s\n", cmd));
}
ns_free(&call);
@ -2155,16 +2205,20 @@ ns_scroll2y(_ns_sess * s, int y)
int
ns_upd_stat(_ns_sess * s)
{
D_ESCREEN(("Forcing update of status line for session 0x%p.\n", s));
if (!s) {
return NS_FAIL;
}
switch (s->backend) {
/* FIXME: Causes other problems. case NS_MODE_NEGOTIATE:*/
#ifdef NS_HAVE_SCREEN
case NS_MODE_SCREEN:
D_ESCREEN(("Calling ns_screen_command(0x%p, %s)\n", s, NS_SCREEN_UPDATE));
return ns_screen_command(s, NS_SCREEN_UPDATE);
#endif
default:
D_ESCREEN(("Failed; backend set to %d\n", s->backend));
return NS_FAIL;
}
}
@ -2568,6 +2622,7 @@ ns_screen_command(_ns_sess * sess, char *cmd)
char *c;
int ret = NS_SUCC;
D_ESCREEN(("Sending command \"%s\"\n", NONULL(cmd)));
if (!cmd || !*cmd) {
return NS_FAIL;
}
@ -3177,7 +3232,7 @@ ns_parse_screen(_ns_sess * screen, int force, int width, char *p)
*p2 = 0; /* make darn sure it's NUL-terminated */
}
D_ESCREEN(("parse_screen: screen sends (%d) ::%s::\n", strlen(p), p));
D_ESCREEN(("parse_screen: screen sends \"%s\" (%d)\n", p, strlen(p)));
if (strlen(p) < 2) { /* special case: display 0 */
disp = screen->dsps; /* might not get a status-line in d0! */
@ -3205,9 +3260,19 @@ ns_parse_screen(_ns_sess * screen, int force, int width, char *p)
if (NS_EFUN_EXISTS(efuns, screen, NULL, waitstate)) {
ret = efuns->waitstate(NULL, screen->delay * 1000);
}
(void) ns_upd_stat(screen);
if (screen->where == NS_LCL) {
D_ESCREEN(("Sending update request.\n"));
ns_upd_stat(screen);
} else {
D_ESCREEN(("Not sending update request (%d).\n", screen->where));
}
} else {
(void) ns_screen_command(screen, NS_SCREEN_INIT);
if (screen->where == NS_LCL) {
D_ESCREEN(("Sending init request.\n"));
(void) ns_screen_command(screen, NS_SCREEN_INIT);
} else {
D_ESCREEN(("Not sending init request (%d).\n", screen->where));
}
screen->timestamp = 1;
}
} else if ((screen->timestamp > 1) && (time(NULL) >= screen->timestamp)) {

4
src/screamcfg.h
View File

@ -68,12 +68,12 @@
#define NS_SCREEN_ACT_T "Activity in window "
/* should be 1s */
#define NS_INIT_DELAY 1
#define NS_INIT_DELAY 2
/* how many seconds to wait for an SSH-tunnel to build when using the
-Z option (tunnel through firewall). 2 for very fast networks,
much more for slow connections. */
#define NS_TUNNEL_DELAY 3
#define NS_TUNNEL_DELAY 30
/* what to call the menu entry for Escreen */
#define NS_MENU_TITLE "Escreen"

22
src/system.c
View File

@ -52,6 +52,7 @@ wait_for_chld(int system_pid)
while (1) {
do {
errno = 0;
usleep(10);
} while ((((pid = waitpid(system_pid, &status, WNOHANG)) == -1) && (errno == EINTR)) || !pid);
/* If the child that exited is the command we spawned, or if the
child exited before fork() returned in the parent, it must be
@ -79,32 +80,20 @@ wait_for_chld(int system_pid)
}
/* Replace the system() call with a fork-and-exec that unprivs the child process */
int
system_wait(char *command)
{
pid_t pid;
D_OPTIONS(("system_wait(%s) called.\n", command));
if (!(pid = fork())) {
setreuid(my_ruid, my_ruid);
setregid(my_rgid, my_rgid);
execl("/bin/sh", "sh", "-c", command, (char *) NULL);
libast_print_error("execl(%s) failed -- %s\n", command, strerror(errno));
exit(EXIT_FAILURE);
} else {
D_OPTIONS(("%d: fork() returned %d\n", getpid(), pid));
return (wait_for_chld(pid));
}
ASSERT_NOTREACHED_RVAL(0);
pid = system_no_wait(command);
return (wait_for_chld(pid));
}
int
pid_t
system_no_wait(char *command)
{
pid_t pid;
D_OPTIONS(("system_no_wait(%s) called.\n", command));
@ -116,5 +105,6 @@ system_no_wait(char *command)
libast_print_error("execl(%s) failed -- %s\n", command, strerror(errno));
exit(EXIT_FAILURE);
}
return (0);
D_OPTIONS(("%d: fork() returned %d\n", getpid(), pid));
return (pid);
}

2
src/system.h
View File

@ -36,6 +36,6 @@ typedef RETSIGTYPE (*eterm_sighandler_t)(int);
extern int wait_for_chld(int);
extern int system_wait(char *);
extern int system_no_wait(char *);
extern pid_t system_no_wait(char *);
#endif /* _SYSTEM_H_ */