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