Mercurial > hg > nnchat
annotate nnchat.c @ 32:67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 04 Aug 2008 06:44:11 +0300 |
| parents | 9b429b283786 |
| children | e49ea6febfeb |
| rev | line source |
|---|---|
| 0 | 1 #include <sys/socket.h> |
| 2 #include <sys/types.h> | |
| 3 #include <arpa/inet.h> | |
| 4 #include <sys/time.h> | |
| 5 #include <netdb.h> | |
| 6 | |
| 7 #include <unistd.h> | |
| 8 #include <stdlib.h> | |
| 9 #include <stdio.h> | |
| 10 #include "th_args.h" | |
| 11 #include "th_string.h" | |
| 12 #include <string.h> | |
| 13 #include <errno.h> | |
| 14 #include <time.h> | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
15 #include <ncurses.h> |
| 0 | 16 |
| 30 | 17 #define SET_MAX_HISTORY (16) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
18 #define SET_BUFSIZE (4096) |
| 0 | 19 #define SET_ALLOC_SIZE (128) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
20 #define SET_DELAY (15) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
21 #define SET_DELAY_USEC (SET_DELAY * 1000) |
| 0 | 22 |
| 23 /* Options | |
| 24 */ | |
| 27 | 25 int optPort = 8005; |
| 26 int optUserColor = 0x408060; | |
| 27 char *optServer = "www11.servemedata.com", | |
| 28 *optUserName = NULL, | |
| 29 *optUserName2 = NULL, | |
| 30 *optPassword = NULL, | |
| 31 *optLogFilename = NULL, | |
| 32 *setTarget = NULL; | |
| 21 | 33 BOOL optDaemon = FALSE; |
| 0 | 34 FILE *optLogFile = NULL; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
35 WINDOW *mainWin = NULL, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
36 *statusWin = NULL, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
37 *editWin = NULL; |
| 30 | 38 BOOL setPrvMode = FALSE; |
| 0 | 39 |
| 40 /* Arguments | |
| 41 */ | |
| 42 optarg_t optList[] = { | |
| 27 | 43 { 0, '?', "help", "Show this help", OPT_NONE }, |
| 44 { 1, 'v', "verbose", "Be more verbose", OPT_NONE }, | |
| 45 { 2, 'p', "port", "Connect to port", OPT_ARGREQ }, | |
| 46 { 3, 's', "server", "Server to connect to", OPT_ARGREQ }, | |
| 47 { 4, 'C', "color", "Initial color in RGB hex 000000", OPT_ARGREQ }, | |
| 48 { 5, 'l', "logfile", "Log filename", OPT_ARGREQ }, | |
| 49 { 6, 'D', "daemon", "A pseudo-daemon mode for logging", OPT_NONE }, | |
| 0 | 50 }; |
| 51 | |
| 52 const int optListN = (sizeof(optList) / sizeof(optarg_t)); | |
| 53 | |
| 54 | |
| 55 void argShowHelp() | |
| 56 { | |
| 57 th_args_help(stdout, optList, optListN, th_prog_name, | |
| 58 "[options] <username> <password>"); | |
| 59 } | |
| 60 | |
| 61 | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
62 int getColor(char *str) |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
63 { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
64 char *p = str; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
65 int len, val = 0; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
66 |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
67 for (len = 0; *p && len < 6; p++, len++) { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
68 if (*p >= '0' && *p <= '9') { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
69 val *= 16; val += (*p - '0'); |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
70 } else if (*p >= 'A' && *p <= 'F') { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
71 val *= 16; val += (*p - 'A') + 10; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
72 } else if (*p >= 'a' && *p <= 'f') { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
73 val *= 16; val += (*p - 'a') + 10; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
74 } else |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
75 return -1; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
76 } |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
77 |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
78 return (len == 6) ? val : -1; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
79 } |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
80 |
| 0 | 81 BOOL argHandleOpt(const int optN, char *optArg, char *currArg) |
| 82 { | |
| 83 switch (optN) { | |
| 84 case 0: | |
| 85 argShowHelp(); | |
| 86 exit(0); | |
| 87 break; | |
| 88 | |
| 89 case 1: | |
| 90 th_verbosityLevel++; | |
| 91 break; | |
| 92 | |
| 93 case 2: | |
| 94 optPort = atoi(optArg); | |
| 95 break; | |
| 96 | |
| 97 case 3: | |
| 98 optServer = optArg; | |
| 99 break; | |
| 100 | |
| 101 case 4: | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
102 if ((optUserColor = getColor(optArg)) < 0) { |
| 0 | 103 THERR("Invalid color argument '%s', should be a RGB hex triplet '000000'.\n", |
| 104 optArg); | |
| 105 return FALSE; | |
| 106 } | |
| 107 THMSG(1, "Using color #%06x\n", optUserColor); | |
| 108 break; | |
| 109 | |
| 110 case 5: | |
| 111 optLogFilename = optArg; | |
| 112 break; | |
| 113 | |
| 21 | 114 case 6: |
| 115 optDaemon = TRUE; | |
| 116 THMSG(1, "Running in pseudo-daemon mode.\n"); | |
| 117 break; | |
| 118 | |
| 0 | 119 default: |
| 120 THERR("Unknown option '%s'.\n", currArg); | |
| 121 return FALSE; | |
| 122 } | |
| 123 | |
| 124 return TRUE; | |
| 125 } | |
| 126 | |
| 127 | |
| 128 BOOL argHandleFile(char *currArg) | |
| 129 { | |
| 130 if (!optUserName) | |
| 131 optUserName = currArg; | |
| 132 else if (!optPassword) | |
| 133 optPassword = currArg; | |
| 134 else { | |
| 135 THERR("Username '%s' already specified on commandline!\n", optUserName); | |
| 136 return FALSE; | |
| 137 } | |
| 138 | |
| 139 return TRUE; | |
| 140 } | |
| 141 | |
| 142 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
143 typedef struct { |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
144 ssize_t pos, len, size; |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
145 char *data; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
146 } editbuf_t; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
147 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
148 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
149 int writeBuf(editbuf_t *buf, ssize_t pos, int ch) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
150 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
151 /* Check arguments */ |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
152 if (buf->len+1 >= buf->size) return -3; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
153 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
154 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
155 return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
156 else if (pos >= buf->len) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
157 buf->data[buf->len++] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
158 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
159 buf->data[pos] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
160 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
161 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
162 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
163 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
164 int insertBuf(editbuf_t *buf, ssize_t pos, int ch) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
165 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
166 /* Check arguments */ |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
167 if (buf->len+1 >= buf->size) return -3; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
168 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
169 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
170 return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
171 else if (pos >= buf->len) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
172 buf->data[buf->len] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
173 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
174 memmove(&(buf->data[pos+1]), &(buf->data[pos]), buf->len - pos + 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
175 buf->data[pos] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
176 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
177 buf->len++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
178 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
179 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
180 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
181 int deleteBuf(editbuf_t *buf, ssize_t pos) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
182 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
183 /* Check arguments */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
184 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
185 return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
186 else if (pos < buf->len) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
187 memmove(&(buf->data[pos]), &(buf->data[pos+1]), buf->len - pos); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
188 buf->len--; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
189 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
190 } else |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
191 return -2; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
192 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
193 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
194 void clearBuf(editbuf_t *buf) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
195 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
196 buf->len = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
197 buf->pos = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
198 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
199 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
200 editbuf_t * newBuf(ssize_t n) |
| 30 | 201 { |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
202 editbuf_t *res = th_calloc(1, sizeof(editbuf_t)); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
203 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
204 res->data = (char *) th_malloc(n); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
205 res->size = n; |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
206 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
207 return res; |
| 30 | 208 } |
| 209 | |
| 210 void freeBuf(editbuf_t *buf) | |
| 211 { | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
212 if (buf) { |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
213 th_free(buf->data); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
214 th_free(buf); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
215 } |
| 30 | 216 } |
| 217 | |
| 218 editbuf_t * copyBuf(editbuf_t *src) | |
| 219 { | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
220 editbuf_t *res; |
| 30 | 221 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
222 assert(src != NULL); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
223 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
224 if (src == NULL) return NULL; |
| 30 | 225 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
226 if ((res = newBuf(src->size)) == NULL) |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
227 return NULL; |
| 30 | 228 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
229 memcpy(res->data, src->data, src->size); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
230 res->pos = res->len = src->len; |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
231 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
232 return res; |
| 30 | 233 } |
| 234 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
235 void setBufPos(editbuf_t *buf, ssize_t pos) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
236 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
237 /* Check arguments */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
238 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
239 buf->pos = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
240 else if (pos >= buf->len) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
241 buf->pos = buf->len; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
242 else |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
243 buf->pos = pos; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
244 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
245 |
| 30 | 246 void updateStatus(BOOL insertMode) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
247 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
248 char tmpStr[128] = ""; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
249 time_t timeStamp; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
250 struct tm *tmpTime;; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
251 |
|
32
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
252 if (statusWin == NULL) return; |
|
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
253 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
254 timeStamp = time(NULL); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
255 if ((tmpTime = localtime(&timeStamp)) != NULL) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
256 strftime(tmpStr, sizeof(tmpStr), "%H:%M:%S", tmpTime); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
257 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
258 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
259 wbkgdset(statusWin, 0x0d00); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
260 werase(statusWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
261 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
262 wattrset(statusWin, A_BOLD); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
263 mvwaddstr(statusWin, 0, 1, tmpStr); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
264 |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
265 waddstr(statusWin, " | "); |
| 30 | 266 wattrset(statusWin, A_BOLD | COLOR_PAIR(16)); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
267 waddstr(statusWin, optUserName); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
268 wattrset(statusWin, A_BOLD | COLOR_PAIR(13)); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
269 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
270 waddstr(statusWin, " | "); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
271 wattrset(statusWin, A_BOLD | COLOR_PAIR(11)); |
| 30 | 272 waddstr(statusWin, insertMode ? "INS" : "DEL"); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
273 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
274 wattrset(statusWin, A_BOLD | COLOR_PAIR(13)); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
275 waddstr(statusWin, " | Prv: "); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
276 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
277 wattrset(statusWin, A_BOLD | COLOR_PAIR(11)); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
278 waddstr(statusWin, setTarget != NULL ? setTarget : "-"); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
279 |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
280 wattrset(statusWin, A_BOLD | COLOR_PAIR(13)); |
| 30 | 281 waddstr(statusWin, " | P/C: "); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
282 wattrset(statusWin, A_BOLD | COLOR_PAIR(11)); |
| 30 | 283 snprintf(tmpStr, sizeof(tmpStr), "%d / #%06x", optPort, optUserColor); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
284 waddstr(statusWin, tmpStr); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
285 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
286 wrefresh(statusWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
287 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
288 |
| 30 | 289 void printEditBuf(char *str, editbuf_t *buf) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
290 { |
|
32
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
291 if (statusWin == NULL || buf == NULL) return; |
|
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
292 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
293 buf->data[buf->len] = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
294 werase(editWin); |
| 30 | 295 |
| 296 wattrset(editWin, A_BOLD); | |
| 297 mvwaddstr(editWin, 0, 0, str); | |
| 298 waddstr(editWin, "> "); | |
| 299 wattrset(editWin, A_NORMAL); | |
| 300 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
301 if (buf->pos < buf->len) { |
| 30 | 302 waddnstr(editWin, buf->data, buf->pos); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
303 wattrset(editWin, A_REVERSE); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
304 waddch(editWin, buf->data[buf->pos]); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
305 wattrset(editWin, A_NORMAL); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
306 waddnstr(editWin, buf->data + buf->pos + 1, buf->len - buf->pos - 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
307 } else { |
| 30 | 308 waddnstr(editWin, buf->data, buf->len); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
309 wattrset(editWin, A_REVERSE); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
310 waddch(editWin, ' '); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
311 wattrset(editWin, A_NORMAL); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
312 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
313 wrefresh(editWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
314 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
315 |
| 15 | 316 int openConnection(struct in_addr *addr, int port) |
| 317 { | |
| 318 struct sockaddr_in tmpAddr; | |
| 319 int sock = -1; | |
| 320 | |
| 321 tmpAddr.sin_family = AF_INET; | |
| 322 tmpAddr.sin_port = htons(port); | |
| 323 tmpAddr.sin_addr = *addr; | |
| 324 | |
| 325 THMSG(1, "Connecting to %s:%d ...\n", | |
| 326 inet_ntoa(tmpAddr.sin_addr), port); | |
| 327 | |
| 328 if ((sock = socket(PF_INET, SOCK_STREAM, 0)) == -1) { | |
| 329 THERR("Could not open socket: %s\n", strerror(errno)); | |
| 330 return -2; | |
| 331 } | |
| 332 | |
| 333 THMSG(2, "Using socket %d.\n", sock); | |
| 334 | |
| 335 if (connect(sock, (struct sockaddr *) &tmpAddr, sizeof(tmpAddr)) == -1) { | |
| 336 THERR("Could not connect: %s\n", strerror(errno)); | |
| 337 return -5; | |
| 338 } | |
| 339 | |
| 340 return sock; | |
| 341 } | |
| 342 | |
| 343 | |
| 344 void closeConnection(int sock) | |
| 345 { | |
| 346 if (sock >= 0) { | |
| 347 close(sock); | |
| 348 } | |
| 349 } | |
| 350 | |
| 351 | |
| 0 | 352 BOOL sendToSocket(int sock, char *buf, const size_t bufLen) |
| 353 { | |
| 354 size_t bufLeft = bufLen; | |
| 355 char *bufPtr = buf; | |
| 356 | |
| 357 while (bufLeft > 0) { | |
| 358 ssize_t bufSent; | |
| 359 bufSent = send(sock, bufPtr, bufLeft, 0); | |
| 360 if (bufSent < 0) return FALSE; | |
| 361 bufLeft -= bufSent; | |
| 362 bufPtr += bufSent; | |
| 363 } | |
| 364 return TRUE; | |
| 365 } | |
| 366 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
367 int printWin(WINDOW *win, const char *fmt) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
368 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
369 const char *s = fmt; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
370 int col = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
371 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
372 while (*s) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
373 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
374 int val = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
375 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
376 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
377 waddch(win, *s | col); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
378 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
379 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
380 while (*s && isdigit(*s)) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
381 val *= 10; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
382 val += (*s - '0'); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
383 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
384 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
385 if (*s != '½') return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
386 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
387 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
388 if (val < 9) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
389 col = A_DIM | COLOR_PAIR(val); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
390 } else if (val < 30) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
391 col = A_BOLD | COLOR_PAIR(val - 9); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
392 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
393 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
394 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
395 waddch(win, *s | col); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
396 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
397 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
398 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
399 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
400 } |
| 0 | 401 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
402 int printFile(FILE *outFile, const char *fmt) |
| 0 | 403 { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
404 const char *s = fmt; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
405 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
406 while (*s) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
407 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
408 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
409 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
410 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
411 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
412 while (*s && isdigit(*s)) s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
413 if (*s != '½') return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
414 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
415 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
416 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
417 fputc(*s, outFile); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
418 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
419 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
420 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
421 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
422 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
423 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
424 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
425 void printMsg(char *fmt, ...) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
426 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
427 char tmpStr[128] = "", buf[8192]; |
| 0 | 428 va_list ap; |
| 429 time_t timeStamp; | |
| 430 struct tm *tmpTime;; | |
| 431 | |
| 432 timeStamp = time(NULL); | |
| 433 if ((tmpTime = localtime(&timeStamp)) != NULL) { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
434 strftime(tmpStr, sizeof(tmpStr), "½17½[½11½%H:%M:%S½17½]½0½ ", tmpTime); |
| 0 | 435 } |
| 436 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
437 va_start(ap, fmt); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
438 vsnprintf(buf, sizeof(buf), fmt, ap); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
439 va_end(ap); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
440 |
| 0 | 441 if (optLogFile) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
442 printFile(optLogFile, tmpStr); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
443 printFile(optLogFile, buf); |
| 0 | 444 fflush(optLogFile); |
| 445 } | |
| 446 | |
| 21 | 447 if (!optDaemon) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
448 printWin(mainWin, tmpStr); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
449 printWin(mainWin, buf); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
450 wrefresh(mainWin); |
| 21 | 451 } |
| 0 | 452 } |
| 453 | |
| 454 | |
| 455 BOOL bufRealloc(char **buf, size_t *size, size_t add) | |
| 456 { | |
| 457 return ((*buf = th_realloc(*buf, *size + add)) != NULL); | |
| 458 } | |
| 459 | |
| 12 | 460 #define PUSHCHAR(x) bufPushChar(&result, &resSize, &resPos, x) |
| 0 | 461 BOOL bufPushChar(char **buf, size_t *size, size_t *pos, char ch) |
| 462 { | |
| 463 if (*pos >= *size && !bufRealloc(buf, size, SET_ALLOC_SIZE)) | |
| 464 return FALSE; | |
| 465 | |
| 466 (*buf)[*pos] = ch; | |
| 467 (*pos)++; | |
| 468 return TRUE; | |
| 469 } | |
| 470 | |
| 12 | 471 #define PUSHSTR(x) bufPushStr(&result, &resSize, &resPos, x) |
| 0 | 472 BOOL bufPushStr(char **buf, size_t *size, size_t *pos, char *str) |
| 473 { | |
| 474 size_t tmpLen; | |
| 475 | |
| 476 if (!str) return FALSE; | |
| 477 tmpLen = strlen(str); | |
| 478 | |
| 479 if ((*pos + tmpLen) >= *size && !bufRealloc(buf, size, tmpLen + SET_ALLOC_SIZE)) | |
| 480 return FALSE; | |
| 481 | |
| 482 strcpy(*buf + *pos, str); | |
| 483 (*pos) += tmpLen; | |
| 484 return TRUE; | |
| 485 } | |
| 486 | |
| 487 | |
| 488 char *encodeStr1(char *str) | |
| 489 { | |
| 490 char *result, *s = str; | |
| 491 size_t resSize, resPos = 0; | |
| 492 | |
| 493 if (!str) return NULL; | |
| 494 | |
| 495 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 496 if ((result = th_malloc(resSize)) == NULL) | |
| 497 return NULL; | |
| 498 | |
| 499 while (*s) { | |
| 500 switch (*s) { | |
| 501 case 32: | |
| 12 | 502 PUSHCHAR('+'); |
| 0 | 503 break; |
| 504 | |
| 505 default: | |
| 506 if (th_isalnum(*s)) | |
| 12 | 507 PUSHCHAR(*s); |
| 0 | 508 else { |
| 509 char tmpStr[4]; | |
| 510 sprintf(tmpStr, "%2X", (unsigned char) *s); | |
| 12 | 511 PUSHCHAR('%'); |
| 512 PUSHSTR(tmpStr); | |
| 0 | 513 } |
| 514 break; | |
| 515 } | |
| 516 s++; | |
| 517 } | |
| 12 | 518 PUSHCHAR(0); |
| 0 | 519 |
| 520 return result; | |
| 521 } | |
| 522 | |
| 15 | 523 |
| 0 | 524 int getxdigit(int c, int shift) |
| 525 { | |
| 526 int i; | |
| 527 | |
| 528 if (c >= 'A' && c <= 'F') | |
| 529 i = c - 'A' + 10; | |
| 530 else if (c >= 'a' && c <= 'f') | |
| 531 i = c - 'a' + 10; | |
| 532 else if (c >= '0' && c <= '9') | |
| 533 i = c - '0'; | |
| 534 else | |
| 535 return -1; | |
| 536 | |
| 537 return i << shift; | |
| 538 } | |
| 539 | |
| 15 | 540 |
| 0 | 541 char *decodeStr1(char *str) |
| 542 { | |
| 543 char *result, *s = str; | |
| 544 size_t resSize, resPos = 0; | |
| 545 int c; | |
| 546 | |
| 547 if (!str) return NULL; | |
| 548 | |
| 549 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 550 if ((result = th_malloc(resSize)) == NULL) | |
| 551 return NULL; | |
| 552 | |
| 553 while (*s) { | |
| 554 switch (*s) { | |
| 555 case '+': | |
| 12 | 556 PUSHCHAR(' '); |
| 0 | 557 s++; |
| 558 break; | |
| 559 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
560 case '½': |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
561 /* Escape these .. */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
562 PUSHCHAR('½'); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
563 PUSHCHAR('½'); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
564 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
565 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
566 |
| 27 | 567 case '\r': |
| 568 PUSHCHAR(' '); | |
| 569 s++; | |
| 570 break; | |
| 571 | |
| 0 | 572 case '%': |
| 573 s++; | |
| 574 if (*s == '%') | |
| 12 | 575 PUSHCHAR('%'); |
| 0 | 576 else if ((c = getxdigit(*s, 4)) >= 0) { |
| 577 int i = getxdigit(*(++s), 0); | |
| 578 if (i >= 0) { | |
| 12 | 579 PUSHCHAR(c | i); |
| 0 | 580 } else { |
| 12 | 581 PUSHCHAR('§'); |
| 582 PUSHCHAR(*s); | |
| 0 | 583 } |
| 584 } else { | |
| 12 | 585 PUSHCHAR('§'); |
| 586 PUSHCHAR(*s); | |
| 0 | 587 } |
| 588 s++; | |
| 589 break; | |
| 590 | |
| 591 default: | |
| 12 | 592 PUSHCHAR(*s); |
| 0 | 593 s++; |
| 594 } | |
| 595 } | |
| 12 | 596 PUSHCHAR(0); |
| 0 | 597 |
| 598 return result; | |
| 599 } | |
| 600 | |
| 601 | |
| 602 char *stripTags(char *str) | |
| 603 { | |
| 604 char *result, *s = str; | |
| 605 size_t resSize, resPos = 0; | |
| 606 | |
| 607 if (!str) return NULL; | |
| 608 | |
| 609 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 610 if ((result = th_malloc(resSize)) == NULL) | |
| 611 return NULL; | |
| 612 | |
| 613 while (*s) { | |
| 614 if (*s == '<') { | |
| 615 while (*s && *s != '>') s++; | |
| 616 if (*s == '>') s++; | |
| 617 } else | |
| 12 | 618 PUSHCHAR(*s++); |
| 0 | 619 } |
| 12 | 620 PUSHCHAR(0); |
| 0 | 621 |
| 622 return result; | |
| 623 } | |
| 624 | |
| 625 | |
| 626 typedef struct { | |
| 627 char c; | |
| 628 char *ent; | |
| 629 } html_entity_t; | |
| 630 | |
| 631 | |
| 632 html_entity_t HTMLEntities[] = { | |
| 633 { '<', "<" }, | |
| 634 { '>', ">" }, | |
| 635 }; | |
| 636 | |
| 637 const int numHTMLEntities = (sizeof(HTMLEntities) / sizeof(html_entity_t)); | |
| 638 | |
| 639 | |
| 640 char *encodeStr2(char *str) | |
| 641 { | |
| 642 char *result, *s = str; | |
| 643 size_t resSize, resPos = 0; | |
| 644 | |
| 645 if (!str) return NULL; | |
| 646 | |
| 647 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 648 if ((result = th_malloc(resSize)) == NULL) | |
| 649 return NULL; | |
| 650 | |
| 651 while (*s) { | |
| 652 int i; | |
| 653 BOOL found = FALSE; | |
| 654 for (i = 0; i < numHTMLEntities; i++) | |
| 655 if (HTMLEntities[i].c == *s) { | |
| 12 | 656 PUSHSTR(HTMLEntities[i].ent); |
| 0 | 657 found = TRUE; |
| 658 break; | |
| 659 } | |
| 12 | 660 if (!found) PUSHCHAR(*s); |
| 0 | 661 |
| 662 s++; | |
| 663 } | |
| 12 | 664 PUSHCHAR(0); |
| 0 | 665 |
| 666 return result; | |
| 667 } | |
| 668 | |
| 669 | |
| 670 char *decodeStr2(char *str) | |
| 671 { | |
| 672 char *result, *s = str; | |
| 673 size_t resSize, resPos = 0; | |
| 674 | |
| 675 if (!str) return NULL; | |
| 676 | |
| 677 resSize = strlen(str); | |
| 678 if ((result = th_malloc(resSize)) == NULL) | |
| 679 return NULL; | |
| 680 | |
| 681 while (*s) { | |
| 682 if (*s == '&') { | |
| 683 int i; | |
| 684 BOOL found = FALSE; | |
| 685 for (i = 0; i < numHTMLEntities; i++) { | |
| 686 html_entity_t *ent = &HTMLEntities[i]; | |
| 687 int len = strlen(ent->ent); | |
| 688 if (!strncmp(s, ent->ent, len)) { | |
| 12 | 689 PUSHCHAR(ent->c); |
| 0 | 690 s += len; |
| 691 found = TRUE; | |
| 692 break; | |
| 693 } | |
| 694 } | |
| 12 | 695 if (!found) PUSHCHAR(*s++); |
| 0 | 696 } else |
| 12 | 697 PUSHCHAR(*s++); |
| 0 | 698 } |
| 12 | 699 PUSHCHAR(0); |
| 0 | 700 |
| 701 return result; | |
| 702 } | |
| 703 | |
| 704 | |
| 705 BOOL sendUserMsg(int sock, char *user, char *fmt, ...) | |
| 706 { | |
| 707 char tmpBuf[4096], tmpBuf2[4096+256]; | |
| 708 int n; | |
| 709 va_list ap; | |
| 710 | |
| 711 va_start(ap, fmt); | |
| 712 n = vsnprintf(tmpBuf, sizeof(tmpBuf), fmt, ap); | |
| 713 va_end(ap); | |
| 714 | |
| 715 if (n < 0) return FALSE; | |
| 716 | |
| 717 snprintf(tmpBuf2, sizeof(tmpBuf2), | |
| 718 "<USER>%s</USER><MESSAGE>%s</MESSAGE>", | |
| 719 user, tmpBuf); | |
| 720 | |
| 721 return sendToSocket(sock, tmpBuf2, strlen(tmpBuf2) + 1); | |
| 722 } | |
| 723 | |
| 724 | |
| 725 int handleUser(int sock, char *str) | |
| 726 { | |
| 727 const char *msg = "</USER><MESSAGE>"; | |
| 22 | 728 char *p = str, *q, *s, *t, *h; |
| 0 | 729 |
| 730 (void) sock; | |
| 731 | |
| 732 s = strstr(str, msg); | |
| 733 if (!s) return 1; | |
| 734 *s = 0; | |
| 735 s += strlen(msg); | |
| 736 | |
| 737 q = strstr(s, "</MESSAGE>"); | |
| 738 if (!q) return 3; | |
| 739 *q = 0; | |
| 740 | |
| 741 s = decodeStr1(s); | |
| 742 if (!s) return -1; | |
| 743 | |
| 744 p = decodeStr1(p); | |
| 745 if (!p) { | |
| 746 th_free(s); | |
| 747 return -2; | |
| 748 } | |
| 749 | |
| 750 | |
| 751 if (*s == '/') { | |
| 19 | 752 if (!strncmp(s, "/BPRV", 5)) { |
| 753 t = stripTags(s + 2); | |
| 22 | 754 h = decodeStr2(t); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
755 printMsg("%s\n", h); |
| 19 | 756 } else { |
| 757 t = stripTags(s + 1); | |
| 22 | 758 h = decodeStr2(t); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
759 printMsg("* %s\n", h); |
| 19 | 760 } |
| 22 | 761 th_free(h); |
| 0 | 762 th_free(t); |
| 763 } else { | |
| 22 | 764 t = stripTags(s); |
| 765 h = decodeStr2(t); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
766 printMsg("½5½<½15½%s½5½>½0½ %s\n", p, h); |
| 22 | 767 th_free(h); |
| 0 | 768 th_free(t); |
| 769 } | |
| 770 | |
| 771 th_free(s); | |
| 772 th_free(p); | |
| 773 return 0; | |
| 774 } | |
| 775 | |
| 776 | |
| 777 int handleLogin(int sock, char *str) | |
| 778 { | |
| 19 | 779 char tmpStr[256] = ""; |
| 780 time_t timeStamp; | |
| 781 struct tm *tmpTime;; | |
| 782 | |
| 783 timeStamp = time(NULL); | |
| 784 if ((tmpTime = localtime(&timeStamp)) != NULL) { | |
| 785 strftime(tmpStr, sizeof(tmpStr), "%c", tmpTime); | |
| 786 } | |
| 787 | |
| 0 | 788 if (!strncmp(str, "FAILURE", 7)) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
789 printMsg("½1½Login failure½0½ - ½3½%s½0½\n", tmpStr); |
| 0 | 790 return -2; |
| 791 } else if (!strncmp(str, "SUCCESS", 7)) { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
792 printMsg("½2½Login success½0½ - ½3½%s½0½\n", tmpStr); |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
793 sendUserMsg(sock, optUserName2, "%%2FRequestUserList"); |
| 0 | 794 return 0; |
| 795 } else | |
| 796 return 1; | |
| 797 } | |
| 798 | |
| 799 | |
| 800 int handleAddUser(int sock, char *str) | |
| 801 { | |
| 9 | 802 char *p, *s = strstr(str, "</ADD_USER>"); |
| 0 | 803 |
| 804 (void) sock; | |
| 805 | |
| 806 if (!s) return 1; | |
| 807 *s = 0; | |
| 9 | 808 |
| 809 p = decodeStr1(str); | |
| 810 if (!p) return -1; | |
| 811 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
812 printMsg("! ½3½%s½0½ ½2½ADDED.½0½\n", p); |
| 9 | 813 th_free(p); |
| 0 | 814 return 0; |
| 815 } | |
| 816 | |
| 817 | |
| 818 int handleDeleteUser(int sock, char *str) | |
| 819 { | |
| 9 | 820 char *p, *s = strstr(str, "</DELETE_USER>"); |
| 0 | 821 |
| 822 (void) sock; | |
| 823 | |
| 824 if (!s) return 1; | |
| 825 *s = 0; | |
| 9 | 826 |
| 827 p = decodeStr1(str); | |
| 828 if (!p) return -1; | |
| 829 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
830 printMsg("! ½3½%s½0½ ½1½DELETED.½0½\n", p); |
| 9 | 831 th_free(p); |
| 0 | 832 return 0; |
| 833 } | |
| 834 | |
| 835 | |
| 836 int handleFoo(int sock, char *str) | |
| 837 { | |
| 838 (void) sock; (void) str; | |
| 839 | |
| 840 return 0; | |
| 841 } | |
| 842 | |
| 843 | |
| 844 typedef struct { | |
| 845 char *cmd; | |
| 846 int (*handler)(int, char *); | |
| 847 } protocmd_t; | |
| 848 | |
| 849 | |
| 850 protocmd_t protoCmds[] = { | |
| 851 { "<USER>", handleUser }, | |
| 852 { "<LOGIN_", handleLogin }, | |
| 853 { "<DELETE_USER>", handleDeleteUser }, | |
| 854 { "<ADD_USER>", handleAddUser }, | |
| 855 { "<NUMCLIENTS>", handleFoo }, | |
| 856 }; | |
| 857 | |
| 858 const int nprotoCmds = (sizeof(protoCmds) / sizeof(protocmd_t)); | |
| 859 | |
| 860 | |
| 861 int handleProtocol(int sock, char *buf, size_t bufLen) | |
| 862 { | |
| 863 int i; | |
| 864 | |
| 865 for (i = 0; i < nprotoCmds; i++) { | |
| 866 size_t cmdLen = strlen(protoCmds[i].cmd); | |
| 867 if (cmdLen < bufLen && !strncmp(buf, protoCmds[i].cmd, cmdLen)) { | |
| 868 return protoCmds[i].handler(sock, buf + cmdLen); | |
| 869 } | |
| 870 } | |
| 871 | |
| 872 return 1; | |
| 873 } | |
| 874 | |
| 875 | |
| 15 | 876 int handleUserInput(int sock, char *buf, size_t bufLen) |
| 0 | 877 { |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
878 char *tmpStr, *tmpStr2, tmpBuf[4096]; |
| 0 | 879 BOOL result; |
| 880 | |
| 881 /* Trim right */ | |
| 882 buf[--bufLen] = 0; | |
| 883 while (bufLen > 0 && (buf[bufLen] == '\n' || buf[bufLen] == '\r' || th_isspace(buf[bufLen]))) | |
| 884 buf[bufLen--] = 0; | |
| 885 | |
| 886 /* Check command */ | |
| 887 if (*buf == 0) { | |
| 888 return 1; | |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
889 } else if (!strncmp(buf, "/color ", 7)) { |
| 30 | 890 int tmpInt; |
| 891 if ((tmpInt = getColor(buf+7)) < 0) { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
892 printMsg("Invalid color value '%s'\n", buf+7); |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
893 return 1; |
|
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
894 } |
| 30 | 895 optUserColor = tmpInt; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
896 printMsg("Setting color to #%06x\n", optUserColor); |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
897 sendUserMsg(sock, optUserName2, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor); |
|
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
898 return 0; |
| 27 | 899 } else if (!strncmp(buf, "/flood ", 7)) { |
| 900 int i; | |
| 901 | |
| 902 snprintf(tmpBuf, sizeof(tmpBuf), "/prv -to %s -msg . .", | |
| 903 buf+7); | |
| 904 | |
| 905 tmpStr = encodeStr2(tmpBuf); | |
| 906 if (!tmpStr) return -2; | |
| 907 tmpStr2 = encodeStr1(tmpStr); | |
| 908 if (!tmpStr2) { | |
| 909 th_free(tmpStr); | |
| 910 return -3; | |
| 911 } | |
| 912 | |
| 913 result = TRUE; | |
| 914 for (i = 0; i < 50 && result; i++) { | |
| 915 result = sendUserMsg(sock, optUserName2, "%s", tmpStr2); | |
| 916 usleep(250); | |
| 917 } | |
| 918 | |
| 919 th_free(tmpStr); | |
| 920 th_free(tmpStr2); | |
| 921 return 0; | |
| 30 | 922 } else if (!strncmp(buf, "/to ", 4)) { |
| 923 buf += 4; | |
| 924 th_free(setTarget); | |
| 925 setTarget = th_strdup(buf); | |
| 926 printMsg("Set prv target to '%s'\n", setTarget); | |
| 927 return 0; | |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
928 } else if (!strncmp(buf, "/msg ", 5)) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
929 if (setTarget != NULL) { |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
930 snprintf(tmpBuf, sizeof(tmpBuf), "/prv -to %s -msg %s", setTarget, buf+5); |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
931 buf = tmpBuf; |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
932 } else { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
933 printMsg("No target set!\n"); |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
934 return 1; |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
935 } |
| 30 | 936 } else if (setPrvMode) { |
| 937 if (setTarget != NULL) { | |
| 938 snprintf(tmpBuf, sizeof(tmpBuf), "/prv -to %s -msg %s", setTarget, buf); | |
| 939 buf = tmpBuf; | |
| 940 } else { | |
| 941 printMsg("No target set, exiting prv mode.\n"); | |
| 942 setPrvMode = FALSE; | |
| 943 return 1; | |
| 944 } | |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
945 } |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
946 |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
947 { |
| 0 | 948 /* Send double-encoded */ |
| 949 tmpStr = encodeStr2(buf); | |
| 950 if (!tmpStr) return -2; | |
| 951 tmpStr2 = encodeStr1(tmpStr); | |
| 952 if (!tmpStr2) { | |
| 953 th_free(tmpStr); | |
| 954 return -3; | |
| 955 } | |
| 956 | |
| 957 result = sendUserMsg(sock, optUserName2, "%s", tmpStr2); | |
| 958 th_free(tmpStr); | |
| 959 th_free(tmpStr2); | |
| 960 if (result) | |
| 961 return 0; | |
| 962 else | |
| 963 return -1; | |
| 964 } | |
| 965 } | |
| 966 | |
| 967 | |
| 968 int main(int argc, char *argv[]) | |
| 969 { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
970 int tmpSocket, curVis, updateCount = 0; |
| 0 | 971 struct hostent *tmpHost; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
972 BOOL argsOK, isError = FALSE, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
973 exitProg = FALSE, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
974 colorSet = FALSE, |
| 30 | 975 cursesInit = FALSE, |
| 976 insertMode = TRUE; | |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
977 struct timeval tv; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
978 fd_set sockfds; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
979 char *tmpStr; |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
980 editbuf_t *editBuf = newBuf(SET_BUFSIZE); |
| 30 | 981 editbuf_t *histBuf[SET_MAX_HISTORY+2]; |
| 982 int histPos = 0, histMax = 0; | |
| 983 | |
| 984 memset(histBuf, 0, sizeof(histBuf)); | |
| 985 | |
| 0 | 986 /* Initialize */ |
| 30 | 987 th_init("NNChat", "Newbie Nudes chat client", "0.5", |
|
6
526ba3b578d7
Changed copyright etc. again.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
988 "Written and designed by Anonymous Finnish Guy (C) 2008", |
|
526ba3b578d7
Changed copyright etc. again.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
989 "This software is freeware, use and distribute as you wish."); |
| 0 | 990 th_verbosityLevel = 0; |
| 991 | |
| 992 /* Parse arguments */ | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
993 argsOK = th_args_process(argc, argv, optList, optListN, |
| 0 | 994 argHandleOpt, argHandleFile, FALSE); |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
995 |
| 0 | 996 /* Check the mode and arguments */ |
| 997 if (optUserName == NULL || optPassword == NULL) { | |
| 998 THERR("User/pass not specified, get some --help\n"); | |
| 999 return -1; | |
| 1000 } | |
| 1001 | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1002 if (!argsOK) |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1003 return -2; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1004 |
| 0 | 1005 /* Open logfile */ |
| 1006 if (optLogFilename) { | |
| 1007 THMSG(1, "Opening logfile '%s'\n", optLogFilename); | |
| 1008 | |
| 1009 if ((optLogFile = fopen(optLogFilename, "a")) == NULL) { | |
| 1010 THERR("Could not open logfile for appending!\n"); | |
| 1011 return -9; | |
| 1012 } | |
| 1013 } | |
| 1014 | |
| 1015 /* Okay ... */ | |
| 1016 THMSG(1, "Trying to resolve host '%s' ...\n", optServer); | |
| 1017 tmpHost = gethostbyname(optServer); | |
| 1018 if (tmpHost == NULL) { | |
| 1019 THERR("Could not resolve hostname: %s.\n", | |
| 1020 hstrerror(h_errno)); | |
| 1021 return -3; | |
| 1022 } | |
| 1023 THMSG(2, "True hostname: %s\n", tmpHost->h_name); | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1024 |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1025 /* To emulate the official client, we first make a fake connection ... */ |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1026 if ((tmpSocket = openConnection((struct in_addr *) tmpHost->h_addr, optPort)) < 0) { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1027 THERR("Fakeprobe connection setup failed!\n"); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1028 goto err_exit; |
| 0 | 1029 } |
| 1030 | |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1031 tmpStr = "<policy-file-request/>"; |
|
23
40fecbab1dc1
Check for error condition properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1032 if (sendToSocket(tmpSocket, tmpStr, strlen(tmpStr) + 1) == FALSE) { |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1033 THERR("Failed to send fakeprobe.\n"); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1034 goto err_exit; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1035 } else { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1036 ssize_t gotBuf; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1037 char tmpBuf[4096]; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1038 gotBuf = recv(tmpSocket, tmpBuf, sizeof(tmpBuf), 0); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1039 tmpBuf[gotBuf-1] = 0; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1040 THMSG(2, "Probe got: %s\n", tmpBuf); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1041 closeConnection(tmpSocket); |
| 0 | 1042 } |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1043 |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1044 /* Okay, now do the proper connection ... */ |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1045 if ((tmpSocket = openConnection((struct in_addr *) tmpHost->h_addr, optPort)) < 0) { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1046 THERR("Main connection setup failed!\n"); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1047 goto err_exit; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1048 } |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1049 |
| 0 | 1050 THMSG(1, "Connected, logging in as '%s'.\n", optUserName); |
| 1051 optUserName2 = encodeStr1(optUserName); | |
| 1052 | |
| 1053 sendUserMsg(tmpSocket, optUserName2, "%%2Flogin%%20%%2Dsite%%20NN%%20%%2Dpassword%%20%s", optPassword); | |
| 1054 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1055 /* Initialize curses */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1056 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1057 if (!optDaemon) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1058 initscr(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1059 raw(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1060 keypad(stdscr, TRUE); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1061 noecho(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1062 timeout(SET_DELAY); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1063 curVis = curs_set(0); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1064 if (has_colors()) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1065 start_color(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1066 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1067 init_pair(1, COLOR_RED, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1068 init_pair(2, COLOR_GREEN, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1069 init_pair(3, COLOR_YELLOW, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1070 init_pair(4, COLOR_BLUE, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1071 init_pair(5, COLOR_MAGENTA, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1072 init_pair(6, COLOR_CYAN, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1073 init_pair(7, COLOR_WHITE, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1074 init_pair(8, COLOR_BLACK, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1075 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1076 init_pair(10, COLOR_BLACK, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1077 init_pair(11, COLOR_WHITE, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1078 init_pair(12, COLOR_GREEN, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1079 init_pair(13, COLOR_YELLOW, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1080 init_pair(14, COLOR_BLUE, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1081 init_pair(15, COLOR_MAGENTA, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1082 init_pair(16, COLOR_CYAN, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1083 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1084 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1085 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1086 mainWin = newwin(LINES - 4, COLS, 0, 0); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1087 statusWin = newwin(1, COLS, LINES - 4, 0); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1088 editWin = newwin(2, COLS, LINES - 3, 0); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1089 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1090 if (mainWin == NULL || statusWin == NULL || editWin == NULL) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1091 THERR("Could not create ncurses windows!\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1092 goto err_exit; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1093 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1094 scrollok(mainWin, 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1095 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1096 clearBuf(editBuf); |
| 30 | 1097 printEditBuf("", editBuf); |
| 1098 updateStatus(insertMode); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1099 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1100 cursesInit = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1101 } |
| 30 | 1102 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1103 |
| 30 | 1104 /* Enter mainloop */ |
| 0 | 1105 FD_ZERO(&sockfds); |
| 1106 FD_SET(tmpSocket, &sockfds); | |
| 1107 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1108 while (!isError && !exitProg) { |
| 0 | 1109 int result; |
| 1110 fd_set tmpfds; | |
| 1111 | |
| 1112 /* Check for incoming data from the server */ | |
| 1113 tv.tv_sec = 0; | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1114 tv.tv_usec = SET_DELAY_USEC; |
| 0 | 1115 tmpfds = sockfds; |
| 1116 if ((result = select(tmpSocket+1, &tmpfds, NULL, NULL, &tv)) == -1) { | |
| 27 | 1117 printMsg("Error occured in select(sockfds): %s\n", |
| 1118 strerror(errno)); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1119 isError = TRUE; |
| 0 | 1120 } else if (FD_ISSET(tmpSocket, &tmpfds)) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1121 ssize_t gotBuf; |
| 30 | 1122 char tmpBuf[8192]; |
| 0 | 1123 gotBuf = recv(tmpSocket, tmpBuf, sizeof(tmpBuf), 0); |
| 1124 | |
| 1125 if (gotBuf < 0) { | |
| 9 | 1126 printMsg("Error in recv: %s\n", strerror(errno)); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1127 isError = TRUE; |
| 0 | 1128 } else if (gotBuf == 0) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1129 printMsg("Server closed connection.\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1130 isError = TRUE; |
| 0 | 1131 } else { |
| 1132 /* Handle protocol data */ | |
| 1133 tmpBuf[gotBuf] = 0; | |
| 1134 result = handleProtocol(tmpSocket, tmpBuf, gotBuf); | |
| 1135 | |
| 1136 if (result > 0) { | |
| 1137 /* Couldn't handle the message for some reason */ | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1138 printMsg("Could not handle: %s\n", tmpBuf); |
| 0 | 1139 } else if (result < 0) { |
| 1140 /* Fatal error, quit */ | |
| 9 | 1141 printMsg("Fatal error with message: %s\n", tmpBuf); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1142 isError = TRUE; |
| 0 | 1143 } |
| 30 | 1144 updateStatus(insertMode); |
| 0 | 1145 } |
| 1146 } | |
| 1147 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1148 /* Handle user input */ |
| 21 | 1149 if (!optDaemon) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1150 int c, cnt = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1151 BOOL update = FALSE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1152 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1153 /* Handle several buffered keypresses at once */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1154 do { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1155 c = getch(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1156 switch (c) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1157 case KEY_ENTER: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1158 case '\n': |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1159 case '\r': |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1160 /* Call the user input handler */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1161 if (editBuf->len > 0) { |
| 30 | 1162 |
| 1163 if (histMax > 0) { | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1164 freeBuf(histBuf[SET_MAX_HISTORY+1]); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1165 histBuf[SET_MAX_HISTORY+1] = NULL; |
| 30 | 1166 memmove(&histBuf[2], &histBuf[1], histMax * sizeof(histBuf[0])); |
| 1167 } | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1168 |
| 30 | 1169 histPos = 0; |
| 1170 histBuf[1] = copyBuf(editBuf); | |
| 1171 if (histMax < SET_MAX_HISTORY) histMax++; | |
| 1172 | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1173 insertBuf(editBuf, editBuf->pos, 0); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1174 result = handleUserInput(tmpSocket, editBuf->data, editBuf->len); |
| 30 | 1175 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1176 clearBuf(editBuf); |
| 30 | 1177 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1178 if (result < 0) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1179 printMsg("Fatal error handling user input: %s\n", editBuf->data); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1180 isError = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1181 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1182 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1183 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1184 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1185 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1186 |
| 30 | 1187 case 0x09: /* Tab = switch between PRV */ |
| 1188 if (setPrvMode) | |
| 1189 setPrvMode = FALSE; | |
| 1190 else { | |
| 1191 if (setTarget != NULL) | |
| 1192 setPrvMode = TRUE; | |
| 1193 } | |
| 1194 update = TRUE; | |
| 1195 break; | |
| 1196 | |
| 1197 case KEY_UP: | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1198 if (histPos == 0) { |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1199 freeBuf(histBuf[0]); |
| 30 | 1200 histBuf[0] = copyBuf(editBuf); |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1201 } |
| 30 | 1202 if (histPos < histMax) { |
| 1203 histPos++; | |
| 1204 freeBuf(editBuf); | |
| 1205 editBuf = copyBuf(histBuf[histPos]); | |
| 1206 update = TRUE; | |
| 1207 } | |
| 1208 break; | |
| 1209 | |
| 1210 case KEY_DOWN: | |
| 1211 if (histPos > 0) { | |
| 1212 histPos--; | |
| 1213 freeBuf(editBuf); | |
| 1214 editBuf = copyBuf(histBuf[histPos]); | |
| 1215 update = TRUE; | |
| 1216 } | |
| 1217 break; | |
| 1218 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1219 case 0x109: /* F1 */ |
| 30 | 1220 if (insertMode) |
| 1221 insertMode = FALSE; | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1222 else |
| 30 | 1223 insertMode = TRUE; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1224 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1225 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1226 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1227 case 0x204: /* ctrl+left */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1228 editBuf->pos--; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1229 while (editBuf->pos > 0 && !isspace(editBuf->data[editBuf->pos])) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1230 editBuf->pos--; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1231 if (editBuf->pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1232 editBuf->pos = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1233 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1234 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1235 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1236 case 0x206: /* ctrl+right */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1237 editBuf->pos++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1238 while (editBuf->pos < editBuf->len && !isspace(editBuf->data[editBuf->pos])) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1239 editBuf->pos++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1240 if (editBuf->pos > editBuf->len) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1241 editBuf->pos = editBuf->len; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1242 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1243 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1244 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1245 case 0x111: /* F9 */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1246 printMsg("Quitting per user request."); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1247 exitProg = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1248 break; |
| 0 | 1249 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1250 case 0x10a: /* F2 */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1251 clearBuf(editBuf); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1252 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1253 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1254 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1255 case KEY_HOME: setBufPos(editBuf, 0); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1256 case KEY_END: setBufPos(editBuf, editBuf->len); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1257 case KEY_LEFT: setBufPos(editBuf, editBuf->pos - 1); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1258 case KEY_RIGHT: setBufPos(editBuf, editBuf->pos + 1); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1259 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1260 case KEY_BACKSPACE: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1261 deleteBuf(editBuf, editBuf->pos - 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1262 setBufPos(editBuf, editBuf->pos - 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1263 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1264 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1265 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1266 case 0x14a: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1267 /* Delete */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1268 deleteBuf(editBuf, editBuf->pos); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1269 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1270 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1271 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1272 case 0x0c: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1273 /* ctrl+l */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1274 redrawwin(mainWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1275 redrawwin(statusWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1276 redrawwin(editWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1277 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1278 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1279 case ERR: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1280 /* Ignore */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1281 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1282 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1283 default: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1284 if (isprint(c)) { |
| 30 | 1285 if (insertMode) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1286 insertBuf(editBuf, editBuf->pos, c); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1287 else |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1288 writeBuf(editBuf, editBuf->pos, c); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1289 setBufPos(editBuf, editBuf->pos + 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1290 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1291 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1292 printMsg("Unhandled key: %02x\n", c); |
| 0 | 1293 } |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1294 break; |
| 0 | 1295 } |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1296 } while (c != ERR && !exitProg && ++cnt < 10); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1297 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1298 if (update) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1299 /* Update edit line */ |
| 30 | 1300 printEditBuf(setPrvMode ? setTarget : "", editBuf); |
| 1301 updateStatus(insertMode); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1302 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1303 } /* !optDaemon */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1304 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1305 if (++updateCount > 10) { |
| 30 | 1306 updateStatus(insertMode); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1307 updateCount = 0; |
| 0 | 1308 } |
| 1309 | |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1310 if (!colorSet) { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1311 colorSet = TRUE; |
| 30 | 1312 printMsg("%s v%s - %s\n", th_prog_name, th_prog_version, th_prog_fullname); |
| 1313 printMsg("%s\n", th_prog_author); | |
| 1314 printMsg("%s\n", th_prog_license); | |
| 27 | 1315 sendUserMsg(tmpSocket, optUserName2, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor); |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1316 } |
| 0 | 1317 } |
| 1318 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1319 /* Shutdown */ |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1320 err_exit: |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1321 if (cursesInit) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1322 if (curVis != ERR) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1323 curs_set(curVis); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1324 endwin(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1325 THMSG(1, "NCurses deinitialized.\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1326 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1327 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1328 if (isError) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1329 THMSG(1, "Error exit.\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1330 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1331 |
| 0 | 1332 th_free(optUserName2); |
| 10 | 1333 |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1334 closeConnection(tmpSocket); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1335 |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1336 THMSG(1, "Connection terminated.\n"); |
| 0 | 1337 |
| 1338 if (optLogFile) { | |
| 1339 THMSG(1, "Closing logfile.\n"); | |
| 1340 fclose(optLogFile); | |
| 1341 } | |
| 1342 | |
| 1343 return 0; | |
| 1344 } |