remove tty from struct hyper_win_size

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>

Author: laijs

src/hyper.h

@@ -74,7 +74,6 @@ struct portmapping_white_list {
 };
 
 struct hyper_win_size {
-	char		*tty;
 	int		row;
 	int		column;
 	uint64_t	seq;

src/init.c

@@ -44,53 +44,30 @@ static int hyper_stop_pod(struct hyper_pod *pod);
 
 static int hyper_set_win_size(char *json, int length)
 {
-	struct hyper_win_size ws = {
-		.tty = NULL,
-	};
+	struct hyper_win_size ws;
 	struct winsize size;
 	struct hyper_exec *exec;
-	char path[128];
-	int fd, ret;
+	int ret;
 
 	fprintf(stdout, "call hyper_win_size, json %s, len %d\n", json, length);
 	if (hyper_parse_winsize(&ws, json, length) < 0) {
 		fprintf(stderr, "set term size failed\n");
 		return -1;
 	}
 
-	if (!ws.tty) {
-		exec = hyper_find_exec_by_seq(&global_pod, ws.seq);
-		if (exec == NULL) {
-			fprintf(stdout, "can not find exec whose seq is %" PRIu64"\n", ws.seq);
-			return 0;
-		}
-
-		fprintf(stdout, "find exec %s, pid is %d, seq is %" PRIu64"\n",
-			exec->id ? exec->id : "pod", exec->pid, ws.seq);
-		fd = dup(exec->ptyfd);
-	} else {
-		if (sprintf(path, "/dev/%s", ws.tty) < 0) {
-			fprintf(stderr, "get tty device failed\n");
-			return -1;
-		}
-		fd = hyper_open_serial_dev(path);
-	}
-
-	if (fd < 0) {
-		perror("cannot open pty device to set term size");
-		goto out;
+	exec = hyper_find_exec_by_seq(&global_pod, ws.seq);
+	if (exec == NULL) {
+		fprintf(stdout, "can not find exec whose seq is %" PRIu64"\n", ws.seq);
+		return 0;
 	}
 
 	size.ws_row = ws.row;
 	size.ws_col = ws.column;
 
-	ret = ioctl(fd, TIOCSWINSZ, &size);
+	ret = ioctl(exec->ptyfd, TIOCSWINSZ, &size);
 	if (ret < 0)
 		perror("cannot ioctl to set pty device term size");
 
-	close(fd);
-out:
-	free(ws.tty);
 	return ret;
 }
 

src/parse.c

@@ -1292,39 +1292,31 @@ int hyper_parse_winsize(struct hyper_win_size *ws, char *json, int length)
 			continue;
 
 		if (i++ == n)
-			goto fail;
+			goto out;
 
-		if (json_token_streq(json, t, "tty")) {
-			if (toks[i].type != JSMN_STRING)
-				goto fail;
-			ws->tty = (json_token_str(json, &toks[i]));
-		} else if (json_token_streq(json, t, "seq")) {
+		if (json_token_streq(json, t, "seq")) {
 			if (toks[i].type != JSMN_PRIMITIVE)
-				goto fail;
+				goto out;
 			ws->seq = json_token_ll(json, &toks[i]);
 		} else if (json_token_streq(json, t, "row")) {
 			if (toks[i].type != JSMN_PRIMITIVE)
-				goto fail;
+				goto out;
 			ws->row = json_token_int(json, &toks[i]);
 		} else if (json_token_streq(json, t, "column")) {
 			if (toks[i].type != JSMN_PRIMITIVE)
-				goto fail;
+				goto out;
 			ws->column = json_token_int(json, &toks[i]);
 		} else {
 			fprintf(stderr, "get unknown section %s in winsize\n",
 				json_token_str(json, t));
-			goto fail;
+			goto out;
 		}
 	}
 
 	ret = 0;
 out:
 	free(toks);
 	return ret;
-fail:
-	free(ws->tty);
-	ws->tty = NULL;
-	goto out;
 }
 
 struct hyper_exec *hyper_parse_execcmd(char *json, int length)