1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
diff -Naur vde2-2.1.6/unixterm/unixterm.c vde2-2.1.6-unixterm/unixterm/unixterm.c
--- vde2-2.1.6/unixterm/unixterm.c 2006-07-07 16:54:39.000000000 +0200
+++ vde2-2.1.6/unixterm/unixterm.c 2007-04-03 12:49:14.000000000 +0200
@@ -4,6 +4,8 @@
* Minimal terminal emulator on a UNIX stream socket
*/
+/* render: addedd support for stdin commands */
+
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
@@ -11,10 +13,12 @@
#include <sys/poll.h>
#include <sys/socket.h>
#include <sys/un.h>
-
+#include <getopt.h>
#include <vde.h>
#define BUFSIZE 1024
+#define LINESIZE 1025
+#define THRESHOLD 4
char buf[BUFSIZE];
int main(int argc,char *argv[])
@@ -23,25 +27,168 @@
int fd;
int rv;
static struct pollfd pfd[]={
- {STDIN_FILENO,POLLIN | POLLHUP,0},
- {STDIN_FILENO,POLLIN | POLLHUP,0}};
+ {STDIN_FILENO,POLLIN | POLLHUP, 0},
+ {STDIN_FILENO,POLLIN | POLLHUP, 0}};
static int fileout[]={STDOUT_FILENO,STDOUT_FILENO};
+ int optret;
+ char *sockpath, *sockname;
+ char sentinel = 0;
+ unsigned char injecting = 0;
+ unsigned char optcount = 0;
+ unsigned char failures = 0;
+ unsigned char loggedout = 0;
+ unsigned char ok_to_write = 0;
+
+ /* options management loop */
+ while (1) {
+ static struct option options[] = {
+ {"inject", 0, 0, 0}, /* get command list from stdin */
+ {"socket", 1, 0, 0}, /* management socket */
+ {0, 0, 0, 0} /* default case */
+ };
+ int option_index = 0;
+
+ if ((optret = getopt_long (argc, argv, "is:", options, &option_index)) == -1)
+ break;
+
+ optcount++;
+
+ switch (optret) {
+ case 0:
+ switch (option_index) {
+ case 0:
+ injecting = 1;
+ break;
+ case 1:
+ if ((sockpath = strdup(optarg)) == NULL)
+ fprintf(stderr, "strdup error\n");
+ sockname = (char *)basename(sockpath);
+ break;
+ default:
+ fprintf(stderr, "unknown long option\n");
+ break;
+ }
+
+ break;
+
+ case 'i':
+ injecting = 1;
+ break;
+
+ case 's':
+ if ((sockpath = strdup(optarg)) == NULL)
+ fprintf(stderr, "strdup error\n");
+ sockname = (char *)basename(sockpath);
+ break;
+
+ case '?':
+ fprintf(stderr, "unknown short option\n");
+ break;
+
+ default:
+ fprintf(stderr, "default case!\n");
+ break;
+ }
+ }
+
sun.sun_family=PF_UNIX;
- snprintf(sun.sun_path,sizeof(sun.sun_path),"%s",argv[1]);
+ snprintf(sun.sun_path,sizeof(sun.sun_path),"%s", optcount ? sockpath : argv[1]);
+
fd=socket(PF_UNIX,SOCK_STREAM,0);
- rv=connect(fd,(struct sockaddr *)(&sun),sizeof(sun));
+
+ if (connect(fd, (struct sockaddr *)(&sun), sizeof(sun)) < 0) {
+ perror("connect");
+ exit(-1);
+ }
+
pfd[1].fd=fileout[0]=fd;
+
while(1) {
- int m,i,n=poll(pfd,2,-1);
- for(i=0;n>0;i++) {
- if(pfd[i].revents & POLLHUP)
- exit(0);
+ int ccount,m,i,n = poll(pfd,2,-1);
+ for(i = 0; n > 0; i++) {
if(pfd[i].revents & POLLIN) {
- n--;
- if((m=read(pfd[i].fd,buf,BUFSIZE)) == 0)
+ --n;
+ if (injecting) {
+ switch (i) {
+ case 0:
+ if (!feof(stdin)) {
+ ccount = 0;
+
+ if (sentinel > 0) {
+ buf[ccount] = sentinel;
+ ccount++;
+ }
+
+ while ((buf[ccount] = fgetc(stdin)) != '\n' && !feof(stdin))
+ ccount++;
+ /* avoid write of empty lines */
+ if ((ccount > 0) && (buf[0] != '\n')) {
+ write(fileout[i],buf,ccount);
+ }
+ sentinel = fgetc(stdin);
+ }
+ /* end of stdin: logout from management console */
+ if (feof(stdin) && !loggedout) {
+ write(fileout[i],"logout\n",strlen("logout\n"));
+ loggedout = 1;
+ }
+
+ break;
+ case 1: {
+ int cursor = 0;
+ int base = 0;
+ char line[LINESIZE];
+ unsigned char start = 1;
+
+ if ((m = read(pfd[i].fd,buf,BUFSIZE)) == 0)
+ exit(0);
+
+ while (cursor < m) {
+ while ((buf[cursor] != '\n') && (cursor <= m))
+ cursor++;
+
+ memcpy(line, &buf[base], cursor - base + 1);
+
+ if (!ok_to_write && (start = (strstr(line, "0000 DATA") == NULL))) {
+ base += (cursor - base) + 1;
+ cursor += 1;
+ } else {
+ if (ok_to_write && (strstr(line, ".\n") != NULL)) {
+ ok_to_write = 0;
+ }
+
+ if (ok_to_write) {
+ write(fileout[i],sockname, strlen(sockname));
+ write(fileout[i],": ", 2);
+ write(fileout[i],line,cursor - base + 1);
+ }
+ else {
+ if (!start) {
+ ok_to_write = 1;
+ start = 1;
+ }
+ }
+ base += (cursor - base) + 1;
+ cursor += 1;
+ }
+ }
+
+ break;
+ }
+ }
+ } else {
+ if((m=read(pfd[i].fd,buf,BUFSIZE)) == 0)
+ exit(0);
+
+ write(fileout[i],buf,m);
+ }
+ }
+
+ if(pfd[i].revents & POLLHUP) {
+ --n;
+ if (sentinel > 0)
exit(0);
- write(fileout[i],buf,m);
}
- }
- }
+ } /* for */
+ } /* infinite while */
}
|
GitWeb