Mercurial > hg > nnchat
annotate main.c @ 624:24d97c710497
Adjust to changes in API.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 21 Jun 2014 02:56:14 +0300 |
parents | 118276b60667 |
children | edac1485308d |
rev | line source |
---|---|
41 | 1 /* |
2 * NNChat - Custom chat client for NewbieNudes.com chatrooms | |
39 | 3 * Written by Matti 'ccr' Hämäläinen |
598 | 4 * (C) Copyright 2008-2014 Tecnic Software productions (TNSP) |
39 | 5 */ |
0 | 6 #include "th_args.h" |
133 | 7 #include "th_config.h" |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
8 #include "th_network.h" |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
9 #include "util.h" |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
10 #include "ui.h" |
555 | 11 #include <unistd.h> |
12 #include <fcntl.h> | |
64
6a3a917303e4
Some random cleanups, bring back WinSock support.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
13 #ifdef __WIN32 |
154
e8f67e344aaf
Get correct directory for saving configuration under Windows.
Matti Hamalainen <ccr@tnsp.org>
parents:
153
diff
changeset
|
14 #include <shlwapi.h> |
533
52c56ada3816
Fix Win32/MinGW cross-compilation target to work with Debian's gcc-mingw-w64
Matti Hamalainen <ccr@tnsp.org>
parents:
532
diff
changeset
|
15 #include <shfolder.h> |
52c56ada3816
Fix Win32/MinGW cross-compilation target to work with Debian's gcc-mingw-w64
Matti Hamalainen <ccr@tnsp.org>
parents:
532
diff
changeset
|
16 #define srandom srand |
52c56ada3816
Fix Win32/MinGW cross-compilation target to work with Debian's gcc-mingw-w64
Matti Hamalainen <ccr@tnsp.org>
parents:
532
diff
changeset
|
17 #define random rand |
128
713879a7ca10
Wait for forked processes, to prevent a zombie apocalypse.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
18 #else |
713879a7ca10
Wait for forked processes, to prevent a zombie apocalypse.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
19 #include <sys/wait.h> |
545
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
20 #include <sys/stat.h> |
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
21 #include <sys/types.h> |
68
3ab7751fdad1
MingW compatibility, with one ugly kludge.
Matti Hamalainen <ccr@tnsp.org>
parents:
67
diff
changeset
|
22 #endif |
0 | 23 |
139
c39399725f7b
Define some platform-specific constants.
Matti Hamalainen <ccr@tnsp.org>
parents:
137
diff
changeset
|
24 #ifdef __WIN32 |
160
d3c78f2ef77b
Rename configuration file for Windows.
Matti Hamalainen <ccr@tnsp.org>
parents:
156
diff
changeset
|
25 #define SET_CONFIG_FILE "nnchat.txt" |
545
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
26 #define SET_LOG_DIR "NNChat Log Files" |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
27 #define SET_DIR_SEPARATOR '\\' |
139
c39399725f7b
Define some platform-specific constants.
Matti Hamalainen <ccr@tnsp.org>
parents:
137
diff
changeset
|
28 #else |
c39399725f7b
Define some platform-specific constants.
Matti Hamalainen <ccr@tnsp.org>
parents:
137
diff
changeset
|
29 #define SET_CONFIG_FILE ".nnchat" |
545
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
30 #define SET_LOG_DIR "nnlogs" |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
31 #define SET_DIR_SEPARATOR '/' |
139
c39399725f7b
Define some platform-specific constants.
Matti Hamalainen <ccr@tnsp.org>
parents:
137
diff
changeset
|
32 #endif |
49
0bcc38910a77
Simple ringbuffer implementation.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
33 |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
34 #define SET_PROFILE_PREFIX "http://www.newbienudes.com/profile/%s/" |
409
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
35 #define SET_NICK_SEPARATOR ':' |
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
36 |
588
573a3ad30938
Bump up the command history size.
Matti Hamalainen <ccr@tnsp.org>
parents:
586
diff
changeset
|
37 #define SET_MAX_HISTORY (64) // Command history length |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
38 #define SET_KEEPALIVE (15*60) // Ping/keepalive period in seconds |
0 | 39 |
49
0bcc38910a77
Simple ringbuffer implementation.
Matti Hamalainen <ccr@tnsp.org>
parents:
46
diff
changeset
|
40 |
592
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
41 typedef struct |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
42 { |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
43 char *name; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
44 int port; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
45 char *desc; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
46 } nn_room_data_t; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
47 |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
48 static const nn_room_data_t nn_room_data[] = |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
49 { |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
50 { "main" , 8005, "Main room" }, |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
51 { "pit" , 8003, "Passion Pit" }, |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
52 }; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
53 |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
54 static const int nn_room_data_n = sizeof(nn_room_data) / sizeof(nn_room_data[0]); |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
55 |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
56 |
0 | 57 /* Options |
58 */ | |
352
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
59 int optPort = 8005, |
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
60 optProxyPort = 1080, |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
61 optProxyType = TH_PROXY_NONE, |
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
62 optProxyAuthType = TH_PROXY_AUTH_NONE; |
207
e0c085426b91
Change default user color to black (#000000).
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
63 int optUserColor = 0x000000; |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
64 char *optServer = "chat.newbienudes.com", |
352
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
65 *optProxyServer = NULL, |
602
4bae14092b78
Add parameters (unused for now) for proxy password etc. in case SOCKS 5
Matti Hamalainen <ccr@tnsp.org>
parents:
601
diff
changeset
|
66 *optProxyUserID = NULL, |
4bae14092b78
Add parameters (unused for now) for proxy password etc. in case SOCKS 5
Matti Hamalainen <ccr@tnsp.org>
parents:
601
diff
changeset
|
67 *optProxyPassword = NULL, |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
68 *optUserName = NULL, |
198
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
69 *optUserNameCmd = NULL, |
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
70 *optUserNameEnc = NULL, |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
71 *optPassword = NULL, |
198
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
72 *optPasswordCmd = NULL, |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
73 *optLogPath = NULL, |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
74 *optLogExtension = ".log", |
409
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
75 *optSite = "NN", |
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
76 *optNickSepStr = NULL; |
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
77 char optNickSep; |
552 | 78 BOOL optDaemon = FALSE, |
79 setIgnoreMode = FALSE, | |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
80 optDebug = FALSE, |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
81 optLogEnable = FALSE, |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
82 optLogDaily = FALSE, |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
83 optOnlyFriendPrv = FALSE; |
140
2d2ef5bbcc11
Use th-libs linked list code for managing ignore list.
Matti Hamalainen <ccr@tnsp.org>
parents:
139
diff
changeset
|
84 |
265
b9c650db8a6a
Rename variable nnIgnoreList to setIgnoreList.
Matti Hamalainen <ccr@tnsp.org>
parents:
264
diff
changeset
|
85 qlist_t *setIgnoreList = NULL, |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
86 *setFriendList = NULL, |
264
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
87 *setIdleMessages = NULL; |
140
2d2ef5bbcc11
Use th-libs linked list code for managing ignore list.
Matti Hamalainen <ccr@tnsp.org>
parents:
139
diff
changeset
|
88 nn_userhash_t *nnUsers = NULL; |
137
fad8c31e41e6
Move browser code around a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
89 char *setConfigFile = NULL, |
fad8c31e41e6
Move browser code around a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
90 *setBrowser = NULL; |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
91 th_cfgitem_t *cfg = NULL; |
89
c2d916b340bf
Change some typedef names; Add struct for user list handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
92 |
513 | 93 nn_editbuf_t *editHistBuf[SET_MAX_HISTORY+2]; |
94 int editHistPos = 0, | |
95 editHistMax = 0; | |
273 | 96 |
97 /* Logging mode flags | |
98 */ | |
391 | 99 enum |
100 { | |
553
b464409fa643
Make LOG_* flags enum more readable and extendable by using hexadecimal values.
Matti Hamalainen <ccr@tnsp.org>
parents:
552
diff
changeset
|
101 LOG_FILE = 0x0001, |
b464409fa643
Make LOG_* flags enum more readable and extendable by using hexadecimal values.
Matti Hamalainen <ccr@tnsp.org>
parents:
552
diff
changeset
|
102 LOG_WINDOW = 0x0002, |
b464409fa643
Make LOG_* flags enum more readable and extendable by using hexadecimal values.
Matti Hamalainen <ccr@tnsp.org>
parents:
552
diff
changeset
|
103 LOG_STAMP = 0x0004, |
b464409fa643
Make LOG_* flags enum more readable and extendable by using hexadecimal values.
Matti Hamalainen <ccr@tnsp.org>
parents:
552
diff
changeset
|
104 LOG_FILE2 = 0x0008, |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
105 LOG_RECURSIVE = 0x0010, |
273 | 106 }; |
107 | |
108 | |
0 | 109 /* Arguments |
110 */ | |
391 | 111 optarg_t optList[] = |
112 { | |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
113 { 0, '?', "help", "Show this help", OPT_NONE }, |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
114 { 1, 'v', "verbose", "Be more verbose", OPT_NONE }, |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
115 { 2, 'p', "port", "Connect to port", OPT_ARGREQ }, |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
116 { 3, 's', "server", "Server to connect to", OPT_ARGREQ }, |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
117 { 4, 'C', "color", "Initial color in RGB hex 000000", OPT_ARGREQ }, |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
118 { 6, 'D', "daemon", "A pseudo-daemon mode for logging", OPT_NONE }, |
352
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
119 { 7, 'f', "force-site", "Force site (default: NN)", OPT_ARGREQ }, |
162
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
120 { 8, 'd', "debug", "Enable various debug features", OPT_NONE }, |
391 | 121 |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
122 {10, 'P', "proxy", "Set proxy data, see below for syntax", OPT_ARGREQ }, |
592
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
123 |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
124 {13, 'r', "room", "Connect to room (main, pit)", OPT_ARGREQ }, |
0 | 125 }; |
126 | |
43
40ba8cdcf03a
Cleanups, added a silly morse code conversion mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
41
diff
changeset
|
127 const int optListN = (sizeof(optList) / sizeof(optList[0])); |
0 | 128 |
129 | |
258 | 130 void argShowHelp(void) |
68
3ab7751fdad1
MingW compatibility, with one ugly kludge.
Matti Hamalainen <ccr@tnsp.org>
parents:
67
diff
changeset
|
131 { |
592
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
132 int i; |
607 | 133 th_print_banner(stdout, th_prog_name, "[options] <username> <password>"); |
391 | 134 |
381
7c28f38cb6dd
Update to use new th-libs from the subrepo.
Matti Hamalainen <ccr@tnsp.org>
parents:
376
diff
changeset
|
135 th_args_help(stdout, optList, optListN); |
592
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
136 |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
137 printf( |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
138 "\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
139 "Supported proxy types are SOCKS 4/4A and SOCKS 5.\n" |
617 | 140 "(Only user/pass auth and no auth supported, no GSSAPI!)\n" |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
141 "These can be set with the -P option as follows:\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
142 "\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
143 " -P <type>://[<userid>[:passwd]@]<host>[:<port>]\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
144 "\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
145 "Type can be socks4, socks4a or socks5. Only socks5\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
146 "supports user/pass authentication.\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
147 "\n" |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
148 "Supported rooms (for option '-r'):\n"); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
149 |
592
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
150 for (i = 0; i < nn_room_data_n; i++) |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
151 { |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
152 printf(" %s - %s (port %d)\n", |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
153 nn_room_data[i].name, |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
154 nn_room_data[i].desc, |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
155 nn_room_data[i].port); |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
156 } |
68
3ab7751fdad1
MingW compatibility, with one ugly kludge.
Matti Hamalainen <ccr@tnsp.org>
parents:
67
diff
changeset
|
157 } |
3ab7751fdad1
MingW compatibility, with one ugly kludge.
Matti Hamalainen <ccr@tnsp.org>
parents:
67
diff
changeset
|
158 |
3ab7751fdad1
MingW compatibility, with one ugly kludge.
Matti Hamalainen <ccr@tnsp.org>
parents:
67
diff
changeset
|
159 |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
160 BOOL argSplitStr(const char *src, const char *at, char **res1, char **res2) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
161 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
162 char *pos, *tmp = th_strdup(src); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
163 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
164 if (tmp != NULL && (pos = strstr(tmp, at)) != NULL) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
165 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
166 *pos = 0; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
167 pos += strlen(at); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
168 *res1 = th_strdup_trim(tmp, TH_TRIM_BOTH); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
169 *res2 = th_strdup_trim(pos, TH_TRIM_BOTH); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
170 th_free(tmp); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
171 return TRUE; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
172 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
173 else |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
174 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
175 th_free(tmp); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
176 return FALSE; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
177 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
178 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
179 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
180 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
181 BOOL argHandleProxyURI(const char *uri) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
182 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
183 // Attempt to parse the proxy URI |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
184 BOOL ret = FALSE; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
185 char *proto = NULL, *rest = NULL, *host = NULL, |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
186 *auth = NULL, *port = NULL; |
612
59588bbf8d55
Remove possible trailing slash from proxy URI.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
187 size_t len; |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
188 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
189 if (!argSplitStr(uri, "://", &proto, &rest)) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
190 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
191 THERR("Malformed proxy URI, should be <type>://[<userid>[:passwd]@]<host>[:<port>]\n"); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
192 goto out; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
193 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
194 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
195 // Validate proxy type |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
196 if (strcasecmp(proto, "socks4") == 0) |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
197 optProxyType = TH_PROXY_SOCKS4; |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
198 else |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
199 if (strcasecmp(proto, "socks4a") == 0) |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
200 optProxyType = TH_PROXY_SOCKS4A; |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
201 else |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
202 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
203 THERR("Invalid proxy type specified: '%s'\n", proto); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
204 goto out; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
205 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
206 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
207 // Does the URI contain anything else? |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
208 if (strlen(rest) == 0) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
209 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
210 THERR("Malformed proxy URI, no host specified.\n"); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
211 goto out; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
212 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
213 |
612
59588bbf8d55
Remove possible trailing slash from proxy URI.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
214 // Remove trailing slash |
59588bbf8d55
Remove possible trailing slash from proxy URI.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
215 len = strlen(rest) - 1; |
59588bbf8d55
Remove possible trailing slash from proxy URI.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
216 if (rest[len] == '/') |
59588bbf8d55
Remove possible trailing slash from proxy URI.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
217 rest[len] = 0; |
59588bbf8d55
Remove possible trailing slash from proxy URI.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
218 |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
219 // Check for auth credentials |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
220 if (argSplitStr(rest, "@", &auth, &host)) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
221 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
222 if (strlen(auth) == 0) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
223 { |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
224 THERR("Malformed proxy URI, zero length authentication credentials.\n"); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
225 goto out; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
226 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
227 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
228 // Should have authentication credentials |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
229 if (!argSplitStr(auth, ":", &optProxyUserID, &optProxyPassword)) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
230 optProxyUserID = th_strdup(auth); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
231 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
232 else |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
233 host = th_strdup(rest); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
234 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
235 // Check if proxy port was specified |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
236 if (argSplitStr(host, ":", &optProxyServer, &port)) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
237 optProxyPort = atoi(port); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
238 else |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
239 optProxyServer = th_strdup(host); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
240 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
241 // Check what authentication type to use |
618
7d1aac6b27af
Disable SOCKS 5 specific code that is not supported yet.
Matti Hamalainen <ccr@tnsp.org>
parents:
617
diff
changeset
|
242 /* |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
243 if (optProxyType == TH_PROXY_SOCKS5 && |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
244 optProxyUserID != NULL && optProxyPassword != NULL) |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
245 optProxyAuthType = TH_PROXY_AUTH_USER; |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
246 else |
618
7d1aac6b27af
Disable SOCKS 5 specific code that is not supported yet.
Matti Hamalainen <ccr@tnsp.org>
parents:
617
diff
changeset
|
247 */ |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
248 optProxyAuthType = TH_PROXY_AUTH_NONE; |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
249 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
250 ret = TRUE; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
251 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
252 out: |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
253 th_free(proto); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
254 th_free(rest); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
255 th_free(host); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
256 th_free(auth); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
257 th_free(port); |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
258 |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
259 return ret; |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
260 } |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
261 |
0 | 262 BOOL argHandleOpt(const int optN, char *optArg, char *currArg) |
263 { | |
391 | 264 switch (optN) |
265 { | |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
266 case 0: |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
267 argShowHelp(); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
268 exit(0); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
269 break; |
0 | 270 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
271 case 1: |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
272 th_verbosityLevel++; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
273 break; |
391 | 274 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
275 case 2: |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
276 optPort = atoi(optArg); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
277 break; |
0 | 278 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
279 case 3: |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
280 optServer = optArg; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
281 break; |
391 | 282 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
283 case 4: |
391 | 284 if ((optUserColor = th_get_hex_triplet(optArg)) < 0) |
285 { | |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
286 THERR("Invalid color argument '%s', should be a RGB hex triplet '000000'.\n", |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
287 optArg); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
288 return FALSE; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
289 } |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
290 THMSG(1, "Using color #%06x\n", optUserColor); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
291 break; |
0 | 292 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
293 case 7: |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
294 optSite = optArg; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
295 break; |
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
296 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
297 case 6: |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
298 optDaemon = TRUE; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
299 THMSG(1, "Running in pseudo-daemon mode.\n"); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
300 break; |
21 | 301 |
162
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
302 case 8: |
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
303 optDebug = TRUE; |
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
304 THMSG(1, "Debug mode enabled.\n"); |
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
305 break; |
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
306 |
352
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
307 |
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
308 case 10: |
608
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
309 if (!argHandleProxyURI(optArg)) |
a8fa7803284a
Change how proxy is specified on commandline.
Matti Hamalainen <ccr@tnsp.org>
parents:
607
diff
changeset
|
310 return FALSE; |
352
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
311 break; |
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
312 |
592
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
313 case 13: |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
314 { |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
315 int i; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
316 for (i = 0; i < nn_room_data_n; i++) |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
317 if (!strcasecmp(nn_room_data[i].name, optArg)) |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
318 { |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
319 optPort = nn_room_data[i].port; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
320 return TRUE; |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
321 } |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
322 |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
323 THERR("Unsupported room '%s'.\n", optArg); |
594
463210f14158
Oops, we didn't error out when the room name was non-existent for -r option.
Matti Hamalainen <ccr@tnsp.org>
parents:
593
diff
changeset
|
324 return FALSE; |
592
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
325 } |
27a6b7c2caad
Add -r option for specifying the room by name instead of port.
Matti Hamalainen <ccr@tnsp.org>
parents:
590
diff
changeset
|
326 break; |
352
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
327 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
328 default: |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
329 THERR("Unknown option '%s'.\n", currArg); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
330 return FALSE; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
331 } |
391 | 332 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
333 return TRUE; |
0 | 334 } |
335 | |
336 | |
337 BOOL argHandleFile(char *currArg) | |
338 { | |
198
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
339 if (!optUserNameCmd) |
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
340 optUserNameCmd = currArg; |
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
341 else if (!optPasswordCmd) |
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
342 optPasswordCmd = currArg; |
391 | 343 else |
344 { | |
198
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
345 THERR("Username '%s' already specified on commandline!\n", optUserNameCmd); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
346 return FALSE; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
347 } |
391 | 348 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
349 return TRUE; |
0 | 350 } |
351 | |
460 | 352 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
353 BOOL nn_conn_send_msg(th_conn_t *conn, const char *user, const char *str) |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
354 { |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
355 char *msg; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
356 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
357 if (str == NULL) |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
358 return FALSE; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
359 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
360 msg = th_strdup_printf("<USER>%s</USER><MESSAGE>%s</MESSAGE>", user, str); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
361 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
362 if (msg != NULL) |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
363 { |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
364 BOOL ret = th_conn_send_buf(conn, msg, strlen(msg) + 1); |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
365 th_free(msg); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
366 return ret; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
367 } |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
368 else |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
369 return FALSE; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
370 } |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
371 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
372 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
373 BOOL nn_conn_send_msg_v(th_conn_t *conn, const char *user, const char *fmt, ...) |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
374 { |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
375 BOOL res; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
376 char *tmp; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
377 va_list ap; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
378 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
379 va_start(ap, fmt); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
380 tmp = th_strdup_vprintf(fmt, ap); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
381 va_end(ap); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
382 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
383 res = nn_conn_send_msg(conn, user, tmp); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
384 th_free(tmp); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
385 return res; |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
386 } |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
387 |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
388 |
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
389 int printFile(FILE *outFile, const char *fmt) |
0 | 390 { |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
391 const char *s = fmt; |
391 | 392 |
393 while (*s) | |
394 { | |
395 if (*s == '½') | |
396 { | |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
397 s++; |
391 | 398 if (*s == '½') |
399 { | |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
400 fputc((unsigned char) *s, outFile); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
401 s++; |
391 | 402 } |
403 else | |
404 { | |
74 | 405 while (*s && isdigit((int) *s)) s++; |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
406 if (*s != '½') return -1; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
407 s++; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
408 } |
391 | 409 } |
410 else | |
411 { | |
191
4007b9ac7cde
Handle usernames with whitespace by converting whitespaces to chr 255 in
Matti Hamalainen <ccr@tnsp.org>
parents:
190
diff
changeset
|
412 if ((unsigned char) *s == 255) |
4007b9ac7cde
Handle usernames with whitespace by converting whitespaces to chr 255 in
Matti Hamalainen <ccr@tnsp.org>
parents:
190
diff
changeset
|
413 fputc(' ', outFile); |
4007b9ac7cde
Handle usernames with whitespace by converting whitespaces to chr 255 in
Matti Hamalainen <ccr@tnsp.org>
parents:
190
diff
changeset
|
414 else |
4007b9ac7cde
Handle usernames with whitespace by converting whitespaces to chr 255 in
Matti Hamalainen <ccr@tnsp.org>
parents:
190
diff
changeset
|
415 fputc((unsigned char) *s, outFile); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
416 s++; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
417 } |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
418 } |
391 | 419 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
420 return 0; |
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
421 } |
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
422 |
620 | 423 |
542
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
424 void printMsgFile(nn_window_t *win, int flags, const char *stamp, const char *msg) |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
425 { |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
426 if (win != NULL && win->logFile != NULL) |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
427 { |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
428 if (flags & LOG_STAMP) printFile(win->logFile, stamp); |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
429 printFile(win->logFile, msg); |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
430 fflush(win->logFile); |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
431 } |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
432 } |
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
433 |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
434 |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
435 void printMsgF(nn_window_t *win, int flags, const char *fmt, ...); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
436 BOOL nn_log_reopen(nn_window_t *win); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
437 |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
438 |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
439 void printMsgConst(nn_window_t *win, int flags, const char *msg) |
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
440 { |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
441 char tmpStr[128]; |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
442 nn_window_t *tmpwin = (win != NULL) ? win : nnwin_main_window(); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
443 |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
444 // Only the main window |
576
414d11df07ce
Gracefully handle error situations when the main UI has not yet been
Matti Hamalainen <ccr@tnsp.org>
parents:
573
diff
changeset
|
445 if (win == NULL && tmpwin != NULL && (flags & LOG_RECURSIVE) == 0) |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
446 { |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
447 time_t currTime = time(NULL); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
448 struct tm *currTm, *prevTm; |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
449 |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
450 if ((currTm = localtime(&currTime)) != NULL && |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
451 currTm->tm_hour == 0 && |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
452 (prevTm = localtime(&tmpwin->logPrevMsgTime)) != NULL && |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
453 prevTm->tm_hour == 23) |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
454 { |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
455 str_get_timestamp(tmpStr, sizeof(tmpStr), "%d %b %Y"); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
456 printMsgF(win, LOG_RECURSIVE, "Day changed to %s.\n", tmpStr); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
457 nn_log_reopen(tmpwin); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
458 } |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
459 |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
460 tmpwin->logPrevMsgTime = currTime; |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
461 } |
391 | 462 |
520 | 463 if (flags & LOG_STAMP) |
464 { | |
465 str_get_timestamp(tmpStr, sizeof(tmpStr), "½17½[½11½%H:%M:%S½17½]½0½ "); | |
466 } | |
391 | 467 |
542
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
468 if (flags & LOG_FILE) |
391 | 469 { |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
470 printMsgFile(win != NULL ? win : nnwin_main_window(), flags, tmpStr, msg); |
544
e30fa8592a48
Possibly fix logging after latest changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
471 } |
542
d8184a3c241f
Clean up window logging logic a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
541
diff
changeset
|
472 |
544
e30fa8592a48
Possibly fix logging after latest changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
473 if (flags & LOG_FILE2) |
e30fa8592a48
Possibly fix logging after latest changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
474 { |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
475 printMsgFile(nnwin_main_window(), flags, tmpStr, msg); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
476 } |
391 | 477 |
478 if (!optDaemon && (flags & LOG_WINDOW)) | |
479 { | |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
480 if (flags & LOG_STAMP) nnwin_print(tmpwin, tmpStr); |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
481 nnwin_print(tmpwin, msg); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
482 } |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
483 } |
391 | 484 |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
485 void printMsgV(nn_window_t *win, int flags, const char *fmt, va_list ap) |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
486 { |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
487 char *buf = th_strdup_vprintf(fmt, ap); |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
488 printMsgConst(win, flags, buf); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
489 th_free(buf); |
0 | 490 } |
491 | |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
492 void printMsg(nn_window_t *win, const char *fmt, ...) |
100
ed4067c10a8a
Remove useless buffer usage from error reporting function.
Matti Hamalainen <ccr@tnsp.org>
parents:
98
diff
changeset
|
493 { |
ed4067c10a8a
Remove useless buffer usage from error reporting function.
Matti Hamalainen <ccr@tnsp.org>
parents:
98
diff
changeset
|
494 va_list ap; |
391 | 495 |
100
ed4067c10a8a
Remove useless buffer usage from error reporting function.
Matti Hamalainen <ccr@tnsp.org>
parents:
98
diff
changeset
|
496 va_start(ap, fmt); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
497 printMsgV(win, LOG_STAMP | LOG_WINDOW | LOG_FILE, fmt, ap); |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
498 va_end(ap); |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
499 } |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
500 |
322
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
501 void printMsgF(nn_window_t *win, int flags, const char *fmt, ...) |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
502 { |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
503 va_list ap; |
391 | 504 |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
505 va_start(ap, fmt); |
322
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
506 printMsgV(win, flags | LOG_STAMP, fmt, ap); |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
507 va_end(ap); |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
508 } |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
509 |
322
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
510 void printMsgQ(nn_window_t *win, const char *fmt, ...) |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
511 { |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
512 va_list ap; |
391 | 513 |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
514 va_start(ap, fmt); |
322
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
515 printMsgV(win, LOG_STAMP | LOG_WINDOW, fmt, ap); |
100
ed4067c10a8a
Remove useless buffer usage from error reporting function.
Matti Hamalainen <ccr@tnsp.org>
parents:
98
diff
changeset
|
516 va_end(ap); |
ed4067c10a8a
Remove useless buffer usage from error reporting function.
Matti Hamalainen <ccr@tnsp.org>
parents:
98
diff
changeset
|
517 } |
ed4067c10a8a
Remove useless buffer usage from error reporting function.
Matti Hamalainen <ccr@tnsp.org>
parents:
98
diff
changeset
|
518 |
0 | 519 |
223
03af28fb1c38
Show error messages printed out to stderr only after the program has quit.
Matti Hamalainen <ccr@tnsp.org>
parents:
222
diff
changeset
|
520 char *errorMessages = NULL; |
03af28fb1c38
Show error messages printed out to stderr only after the program has quit.
Matti Hamalainen <ccr@tnsp.org>
parents:
222
diff
changeset
|
521 |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
522 void errorMsgConst(const char *msg) |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
523 { |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
524 printMsgConst(NULL, LOG_STAMP | LOG_WINDOW | LOG_FILE, msg); |
391 | 525 |
526 if (errorMessages != NULL) | |
527 { | |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
528 // XXX Yes, this is lazy. |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
529 char *tmp = th_strdup_printf("%s%s", errorMessages, msg); |
223
03af28fb1c38
Show error messages printed out to stderr only after the program has quit.
Matti Hamalainen <ccr@tnsp.org>
parents:
222
diff
changeset
|
530 th_free(errorMessages); |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
531 errorMessages = tmp; |
391 | 532 } |
533 else | |
563
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
534 errorMessages = th_strdup(msg); |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
535 } |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
536 |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
537 |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
538 void errorMsgV(const char *fmt, va_list ap) |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
539 { |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
540 char *msg = th_strdup_vprintf(fmt, ap); |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
541 errorMsgConst(msg); |
c3e4e8f3c658
Refactor message/error/etc printing functions to be a bit more sane.
Matti Hamalainen <ccr@tnsp.org>
parents:
561
diff
changeset
|
542 th_free(msg); |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
543 } |
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
544 |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
545 |
236
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
546 void errorMsg(const char *fmt, ...) |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
547 { |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
548 va_list ap; |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
549 |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
550 va_start(ap, fmt); |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
551 errorMsgV(fmt, ap); |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
552 va_end(ap); |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
553 } |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
554 |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
555 |
513 | 556 void debugMsg(const char *fmt, ...) |
557 { | |
558 if (optDebug) | |
559 { | |
560 va_list ap; | |
561 | |
562 va_start(ap, fmt); | |
544
e30fa8592a48
Possibly fix logging after latest changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
563 printMsgV(NULL, LOG_FILE | LOG_WINDOW, fmt, ap); |
513 | 564 va_end(ap); |
565 } | |
566 } | |
567 | |
568 | |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
569 void nn_network_errfunc(struct _th_conn_t *conn, int err, const char *msg) |
236
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
570 { |
262
6d48fc4fd421
Shut up some trivial warnings.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
571 (void) conn; |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
572 (void) err; |
564
6e5789cbb4d4
Change network layer error/info message passing API to pass direct strings
Matti Hamalainen <ccr@tnsp.org>
parents:
563
diff
changeset
|
573 errorMsg("%s", msg); |
236
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
574 } |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
575 |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
576 |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
577 void nn_network_msgfunc(struct _th_conn_t *conn, int loglevel, const char *msg) |
236
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
578 { |
262
6d48fc4fd421
Shut up some trivial warnings.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
579 (void) conn; |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
580 (void) loglevel; |
564
6e5789cbb4d4
Change network layer error/info message passing API to pass direct strings
Matti Hamalainen <ccr@tnsp.org>
parents:
563
diff
changeset
|
581 printMsgConst(NULL, LOG_STAMP | LOG_WINDOW | LOG_FILE, msg); |
236
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
582 } |
71fa0364c058
Report network errors to the user.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
583 |
225
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
584 |
565
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
585 void nn_ioctx_errfunc(th_ioctx_t *ctx, int err, const char *msg) |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
586 { |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
587 (void) err; |
582
8a0c2eb25b35
Adjust certain error message formats slightly.
Matti Hamalainen <ccr@tnsp.org>
parents:
581
diff
changeset
|
588 errorMsg("[%s:%d] %s", |
565
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
589 ctx->filename, ctx->line, msg); |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
590 } |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
591 |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
592 |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
593 void nn_ioctx_msgfunc(th_ioctx_t *ctx, const char *msg) |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
594 { |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
595 (void) ctx; |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
596 printMsgConst(NULL, LOG_STAMP | LOG_WINDOW | LOG_FILE, msg); |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
597 } |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
598 |
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
599 |
620 | 600 BOOL nn_check_name_list(qlist_t *list, const char *name) |
225
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
601 { |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
602 qlist_t *node; |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
603 |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
604 for (node = list; node != NULL; node = node->next) |
391 | 605 { |
372
b9f0bdad6285
Use th_strcasecmp() and th_strncasecmp().
Matti Hamalainen <ccr@tnsp.org>
parents:
369
diff
changeset
|
606 if (th_strcasecmp(name, (char *) node->data) == 0) |
225
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
607 return TRUE; |
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
608 } |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
609 |
225
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
610 return FALSE; |
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
611 } |
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
612 |
801ac37321f6
Sanitize ignore handling; Also action messages and PRVs were not being properly ignored, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
223
diff
changeset
|
613 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
614 int nnproto_parse_user(th_conn_t *conn) |
0 | 615 { |
229
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
616 BOOL isMine, isIgnored = FALSE; |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
617 char *name, *msg, *t; |
391 | 618 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
619 // Find start of the message |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
620 name = conn->ptr; |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
621 t = th_conn_buf_strstr(conn, "</USER>"); |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
622 if (!t) return 1; |
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
623 *t = 0; |
391 | 624 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
625 // Find end of the message |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
626 t = th_conn_buf_strstr(conn, "<MESSAGE>"); |
430
aaadf6cea6be
Better handling of some messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
429
diff
changeset
|
627 if (!t) return 2; |
aaadf6cea6be
Better handling of some messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
429
diff
changeset
|
628 msg = conn->ptr; |
aaadf6cea6be
Better handling of some messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
429
diff
changeset
|
629 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
630 t = th_conn_buf_strstr(conn, "</MESSAGE>"); |
229
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
631 if (!t) return 3; |
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
632 *t = 0; |
391 | 633 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
634 // Decode message string |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
635 msg = nn_decode_str1(msg); |
481 | 636 if (!msg) |
637 { | |
638 errorMsg("Decode/malloc failure @ nnproto_parse_user()\n"); | |
639 return -1; | |
640 } | |
391 | 641 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
642 // Decode username |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
643 name = nn_decode_str1(name); |
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
644 if (!name) |
391 | 645 { |
481 | 646 errorMsg("Decode/malloc failure @ nnproto_parse_user()\n"); |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
647 th_free(msg); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
648 return -2; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
649 } |
229
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
650 |
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
651 /* Check if the username is on our ignore list and |
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
652 * that it is not our OWN username! |
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
653 */ |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
654 isMine = strcmp(name, optUserName) == 0; |
620 | 655 isIgnored = setIgnoreMode && !isMine && nn_check_name_list(setIgnoreList, name); |
108
f323b137ca08
Tab-completion now works with cycling, but bugs with names that have whitespaces.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
656 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
657 // Is it a special control message? |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
658 if (*msg == '/') |
391 | 659 { |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
660 // Ignore room join/leave messages |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
661 if (!optDebug && (strstr(msg, "left the room") || strstr(msg, "joined the room from"))) |
229
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
662 goto done; |
108
f323b137ca08
Tab-completion now works with cycling, but bugs with names that have whitespaces.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
663 |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
664 t = nn_strip_tags(msg + 1); |
391 | 665 if (!strncmp(t, "BPRV ", 5)) |
666 { | |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
667 char *in_name, *tmp, *in_msg, *h; |
293 | 668 nn_window_t *win; |
669 h = nn_decode_str2(t + 1); | |
391 | 670 |
418 | 671 // Check type of |
672 if ((isMine = strncmp(t, "BPRV from ", 10)) == 0) | |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
673 in_name = nn_decode_str2(t + 10); |
391 | 674 else |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
675 in_name = nn_decode_str2(t + 8); |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
676 |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
677 for (tmp = in_name; *tmp && *tmp != ':'; tmp++); |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
678 if (tmp[0] != 0 && tmp[1] == ' ') |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
679 in_msg = tmp + 2; |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
680 else |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
681 in_msg = ""; |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
682 *tmp = 0; |
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
683 |
620 | 684 if (!optOnlyFriendPrv || !nn_check_name_list(setFriendList, in_name)) |
391 | 685 { |
620 | 686 isIgnored = setIgnoreMode && nn_check_name_list(setIgnoreList, in_name); |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
687 win = nnwin_find(in_name); |
388
f45673fe6b23
Log private messages always in the PRV format.
Matti Hamalainen <ccr@tnsp.org>
parents:
385
diff
changeset
|
688 |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
689 if (win != NULL) |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
690 { |
544
e30fa8592a48
Possibly fix logging after latest changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
691 printMsgF(win, isIgnored ? LOG_FILE : (LOG_FILE | LOG_WINDOW), |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
692 "½5½<½%d½%s½5½>½0½ %s\n", |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
693 isMine ? 14 : 15, isMine ? optUserName : in_name, in_msg); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
694 |
544
e30fa8592a48
Possibly fix logging after latest changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
542
diff
changeset
|
695 printMsgF(NULL, LOG_FILE2, "½11½%s½0½\n", h); |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
696 } |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
697 else |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
698 { |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
699 printMsgF(NULL, isIgnored ? LOG_FILE : (LOG_WINDOW | LOG_FILE), |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
700 "½11½%s½0½\n", h); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
701 } |
391 | 702 } |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
703 |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
704 th_free(in_name); |
293 | 705 th_free(h); |
391 | 706 } |
707 else | |
708 { | |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
709 // It's an action (/me) |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
710 char *h = nn_decode_str2(t); |
322
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
711 printMsgF(NULL, isIgnored ? LOG_FILE : (LOG_WINDOW | LOG_FILE), |
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
712 "½9½* %s½0½\n", h); |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
713 th_free(h); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
714 } |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
715 th_free(t); |
391 | 716 } |
717 else | |
718 { | |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
719 // It's a normal message |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
720 char *h; |
530
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
721 int colorNick, colorText; |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
722 t = nn_strip_tags(msg); |
97
218efd2f0641
Rename functions for clarity.
Matti Hamalainen <ccr@tnsp.org>
parents:
96
diff
changeset
|
723 h = nn_decode_str2(t); |
530
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
724 if (isMine) |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
725 { |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
726 colorNick = 14; |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
727 colorText = 0; |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
728 } |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
729 else |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
730 { |
620 | 731 if (nn_check_name_list(setFriendList, name)) |
530
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
732 { |
535
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
733 colorNick = 11; |
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
734 colorText = 0; |
530
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
735 } |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
736 else |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
737 { |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
738 colorNick = 15; |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
739 colorText = 0; |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
740 } |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
741 } |
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
742 |
322
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
743 printMsgF(NULL, isIgnored ? LOG_FILE : (LOG_WINDOW | LOG_FILE), |
530
f0bca971170b
Change coloring to use friend list as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
526
diff
changeset
|
744 "½5½<½%d½%s½5½>½%d½ %s½0½\n", colorNick, name, colorText, h); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
745 th_free(h); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
746 th_free(t); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
747 } |
108
f323b137ca08
Tab-completion now works with cycling, but bugs with names that have whitespaces.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
748 |
229
08d4355d6fc9
Repair automatic PRV target setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
228
diff
changeset
|
749 done: |
417
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
750 th_free(msg); |
ccee77fe4525
Fix protocol message parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
416
diff
changeset
|
751 th_free(name); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
752 return 0; |
0 | 753 } |
754 | |
755 | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
756 int nnproto_parse_login(th_conn_t *conn) |
0 | 757 { |
156
0a9fe14882dc
Introduce utility function getTimeStamp() and use it to lessen code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
155
diff
changeset
|
758 char tmpStr[256]; |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
759 str_get_timestamp(tmpStr, sizeof(tmpStr), "%c"); |
391 | 760 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
761 if (!th_conn_buf_strcmp(conn, "FAILURE>")) |
391 | 762 { |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
763 th_conn_buf_strstr(conn, "</LOGIN_FAILURE>"); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
764 th_conn_buf_strstr(conn, "</USER>"); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
765 printMsg(NULL, "½1½Login failure½0½ - ½3½%s½0½\n", tmpStr); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
766 return -2; |
391 | 767 } |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
768 else if (!th_conn_buf_strcmp(conn, "SUCCESS>")) |
391 | 769 { |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
770 th_conn_buf_strstr(conn, "</LOGIN_SUCCESS>"); |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
771 th_conn_buf_strstr(conn, "</USER>"); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
772 printMsg(NULL, "½2½Login success½0½ - ½3½%s½0½\n", tmpStr); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
773 nn_conn_send_msg(conn, optUserNameEnc, "%2FRequestUserList"); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
774 return 0; |
391 | 775 } |
776 else | |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
777 return 1; |
0 | 778 } |
779 | |
780 | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
781 int nnproto_parse_add_user(th_conn_t *conn) |
0 | 782 { |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
783 char *p, *s, *str = conn->ptr; |
297
d34910f1b1e1
Print messages about user leaving or joining the chat in the specific buffer, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
784 nn_window_t *win; |
0 | 785 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
786 s = th_conn_buf_strstr(conn, "</ADD_USER>"); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
787 if (!s) return 1; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
788 *s = 0; |
391 | 789 |
97
218efd2f0641
Rename functions for clarity.
Matti Hamalainen <ccr@tnsp.org>
parents:
96
diff
changeset
|
790 p = nn_dbldecode_str(str); |
481 | 791 if (!p) |
792 { | |
793 errorMsg("Decode/malloc failure @ nnproto_parse_add_user()\n"); | |
794 return -1; | |
795 } | |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
796 |
422 | 797 win = nnwin_find(p); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
798 nn_userhash_insert(nnUsers, nn_username_encode(p)); |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
799 |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
800 printMsg(NULL, "! ½3½%s½0½ ½2½ADDED.½0½\n", p); |
297
d34910f1b1e1
Print messages about user leaving or joining the chat in the specific buffer, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
801 if (win != NULL) |
d34910f1b1e1
Print messages about user leaving or joining the chat in the specific buffer, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
802 printMsg(win, "! ½3½%s½0½ ½2½joined the chat.½0½\n", p); |
d34910f1b1e1
Print messages about user leaving or joining the chat in the specific buffer, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
803 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
804 th_free(p); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
805 return 0; |
0 | 806 } |
807 | |
808 | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
809 int nnproto_parse_delete_user(th_conn_t *conn) |
0 | 810 { |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
811 char *p, *s, *str = conn->ptr; |
297
d34910f1b1e1
Print messages about user leaving or joining the chat in the specific buffer, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
812 nn_window_t *win; |
0 | 813 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
814 s = th_conn_buf_strstr(conn, "</DELETE_USER>"); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
815 if (!s) return 1; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
816 *s = 0; |
391 | 817 |
97
218efd2f0641
Rename functions for clarity.
Matti Hamalainen <ccr@tnsp.org>
parents:
96
diff
changeset
|
818 p = nn_dbldecode_str(str); |
481 | 819 if (!p) |
820 { | |
821 errorMsg("Decode/malloc failure @ nnproto_parse_delete_user()\n"); | |
822 return -1; | |
823 } | |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
824 |
422 | 825 win = nnwin_find(p); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
826 nn_userhash_delete(nnUsers, nn_username_encode(p)); |
107
8037a3a7e491
Implement username tab-completion. It's still buggy, tho.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
827 |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
828 printMsg(NULL, "! ½3½%s½0½ ½1½DELETED.½0½\n", p); |
297
d34910f1b1e1
Print messages about user leaving or joining the chat in the specific buffer, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
829 if (win != NULL) |
d34910f1b1e1
Print messages about user leaving or joining the chat in the specific buffer, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
830 printMsg(win, "! ½3½%s½0½ ½1½left the chat.½0½\n", p); |
391 | 831 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
832 th_free(p); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
833 return 0; |
0 | 834 } |
835 | |
836 | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
837 int nnproto_parse_num_clients(th_conn_t *conn) |
0 | 838 { |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
839 th_conn_buf_strstr(conn, "</NUMCLIENTS>"); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
840 return 0; |
0 | 841 } |
842 | |
843 | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
844 int nnproto_parse_boot(th_conn_t *conn) |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
845 { |
391 | 846 (void) conn; |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
847 errorMsg("Booted by server.\n"); |
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
848 return -1; |
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
849 } |
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
850 |
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
851 |
391 | 852 typedef struct |
853 { | |
443 | 854 char *name; |
431
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
855 size_t len; |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
856 int (*handler)(th_conn_t *); |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
857 } nn_protocolcmd_t; |
0 | 858 |
859 | |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
860 static nn_protocolcmd_t protoCmds[] = |
391 | 861 { |
431
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
862 { "<USER>", 0, nnproto_parse_user }, |
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
863 { "<LOGIN_", 0, nnproto_parse_login }, |
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
864 { "<DELETE_USER>", 0, nnproto_parse_delete_user }, |
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
865 { "<ADD_USER>", 0, nnproto_parse_add_user }, |
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
866 { "<NUMCLIENTS>", 0, nnproto_parse_num_clients }, |
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
867 { "<BOOT />", 0, nnproto_parse_boot }, |
0 | 868 }; |
869 | |
108
f323b137ca08
Tab-completion now works with cycling, but bugs with names that have whitespaces.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
870 static const int nprotoCmds = sizeof(protoCmds) / sizeof(protoCmds[0]); |
0 | 871 |
872 | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
873 int nn_parse_protocol(th_conn_t *conn) |
0 | 874 { |
130
352ec3c300e4
A different initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
129
diff
changeset
|
875 static BOOL protoCmdsInit = FALSE; |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
876 int i; |
130
352ec3c300e4
A different initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
129
diff
changeset
|
877 |
391 | 878 if (!protoCmdsInit) |
879 { | |
130
352ec3c300e4
A different initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
129
diff
changeset
|
880 for (i = 0; i < nprotoCmds; i++) |
443 | 881 protoCmds[i].len = strlen(protoCmds[i].name); |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
882 |
130
352ec3c300e4
A different initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
129
diff
changeset
|
883 protoCmdsInit = TRUE; |
352ec3c300e4
A different initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
129
diff
changeset
|
884 } |
391 | 885 |
886 for (i = 0; i < nprotoCmds; i++) | |
887 { | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
888 if (!th_conn_buf_strncmp(conn, protoCmds[i].name, protoCmds[i].len)) |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
889 return protoCmds[i].handler(conn); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
890 } |
162
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
891 |
391 | 892 if (optDebug) |
893 { | |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
894 printMsg(NULL, "Unknown protocmd: \"%s\"\n", conn->ptr); |
162
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
895 return 0; |
391 | 896 } |
897 else | |
162
e59cec397811
Add a debug mode option (commandline) and enable certain features when we are in debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
161
diff
changeset
|
898 return 1; |
0 | 899 } |
900 | |
402
563a70e8a303
Oops, these functions were moved/renamed and were left out from a previous commit. :|
Matti Hamalainen <ccr@tnsp.org>
parents:
401
diff
changeset
|
901 |
474
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
902 int nn_open_uri(const char *uri) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
903 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
904 #ifdef __WIN32 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
905 HINSTANCE status; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
906 |
442 | 907 status = ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNA); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
908 if (status <= (HINSTANCE) 32) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
909 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
910 printMsgQ(currWin, "Could not launch default web browser: %d\n", status); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
911 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
912 #else |
474
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
913 int status; |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
914 int fds[2]; |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
915 pid_t pid; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
916 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
917 if (pipe(fds) == -1) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
918 { |
621
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
919 int ret = th_get_error(); |
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
920 printMsgQ(currWin, "Could not open process communication pipe! (%d, %s)\n", |
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
921 ret, th_error_str(ret)); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
922 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
923 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
924 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
925 if ((pid = fork()) < 0) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
926 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
927 printMsgQ(currWin, "Could not create sub-process!\n"); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
928 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
929 else if (pid == 0) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
930 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
931 dup2(fds[1], STDOUT_FILENO); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
932 dup2(fds[0], STDERR_FILENO); |
474
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
933 char *url = th_strdup_printf("openurl(%s,new-tab)", uri); |
478
4dca76db9e1f
Fix opening of browser windows on UNIX.
Matti Hamalainen <ccr@tnsp.org>
parents:
474
diff
changeset
|
934 execlp(setBrowser, setBrowser, "-remote", url, (void *)NULL); |
474
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
935 th_free(url); |
621
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
936 _exit(th_get_error()); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
937 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
938 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
939 wait(&status); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
940 #endif |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
941 |
474
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
942 return 0; |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
943 } |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
944 |
516 | 945 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
946 int nncmd_send_raw(th_conn_t *conn, char *str) |
603
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
947 { |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
948 #if 1 |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
949 char *tmp = nn_encode_str1(str); |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
950 if (tmp == NULL) return -2; |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
951 nn_conn_send_msg(conn, optUserNameEnc, tmp); |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
952 th_free(tmp); |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
953 #else |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
954 nn_conn_send_msg(conn, optUserNameEnc, str); |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
955 #endif |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
956 |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
957 return 0; |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
958 } |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
959 |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
960 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
961 int nncmd_open_profile(th_conn_t *conn, char *name) |
474
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
962 { |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
963 char *enc_name = nn_encode_str1(name); |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
964 char *uri = th_strdup_printf(SET_PROFILE_PREFIX, name); |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
965 (void) conn; |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
966 |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
967 printMsg(currWin, "Opening profile for: '%s'\n", name); |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
968 |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
969 nn_open_uri(uri); |
4ddc3d87242e
Refactor web-browser launching into nn_open_uri().
Matti Hamalainen <ccr@tnsp.org>
parents:
473
diff
changeset
|
970 |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
971 th_free(uri); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
972 th_free(enc_name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
973 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
974 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
975 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
976 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
977 int nncmd_change_list(th_conn_t *conn, const char *listname, qlist_t **list, const char *name) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
978 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
979 (void) conn; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
980 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
981 if (name[0]) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
982 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
983 // Add or remove someone to/from ignore |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
984 qlist_t *user = th_llist_find_func(*list, name, str_compare); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
985 if (user != NULL) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
986 { |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
987 printMsgQ(currWin, "Removed user '%s' from %s list.\n", name, listname); |
531 | 988 th_llist_delete_node(list, user); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
989 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
990 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
991 { |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
992 printMsgQ(currWin, "Added '%s' to %s list.\n", name, listname); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
993 th_llist_append(list, th_strdup(name)); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
994 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
995 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
996 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
997 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
998 // Just list whomever is in ignore now |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
999 qlist_t *user = *list; |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1000 size_t nuser = th_llist_length(*list); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1001 char *result = th_strdup_printf("Users on %s list (%d): ", listname, nuser); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1002 while (user != NULL) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1003 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1004 if (user->data != NULL) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1005 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1006 th_pstr_printf(&result, "%s'%s'", result, (char *) user->data); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1007 if (--nuser > 0) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1008 th_pstr_printf(&result, "%s, ", result); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1009 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1010 user = user->next; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1011 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1012 printMsgQ(currWin, "%s\n", result); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1013 th_free(result); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1014 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1015 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1016 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1017 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1018 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1019 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1020 int nncmd_ignore(th_conn_t *conn, char *name) |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1021 { |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1022 return nncmd_change_list(conn, "ignore", &setIgnoreList, name); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1023 } |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1024 |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1025 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1026 int nncmd_friend(th_conn_t *conn, char *name) |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1027 { |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1028 return nncmd_change_list(conn, "friend", &setFriendList, name); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1029 } |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1030 |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1031 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1032 int nncmd_set_color(th_conn_t *conn, char *arg) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1033 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1034 int val; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1035 (void) conn; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1036 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1037 if ((val = th_get_hex_triplet(arg)) < 0) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1038 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1039 printMsgQ(currWin, "Invalid color value '%s'\n", arg); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1040 return 1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1041 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1042 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1043 optUserColor = val; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1044 printMsgQ(currWin, "Setting color to #%06x\n", optUserColor); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1045 nn_conn_send_msg_v(conn, optUserNameEnc, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1046 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1047 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1048 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1049 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1050 int nncmd_open_query(th_conn_t *conn, char *name) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1051 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1052 (void) conn; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1053 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1054 if (name[0]) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1055 { |
446
3396acd40147
Rename and remove some functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1056 nn_user_t *user = nn_userhash_find(nnUsers, nn_username_encode(name)); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1057 if (user != NULL) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1058 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1059 name = nn_username_decode(th_strdup(user->name)); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1060 printMsgQ(currWin, "Opening PRV query for '%s'.\n", name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1061 if (nnwin_open(name, TRUE)) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1062 printMsgQ(currWin, "In PRV query with '%s'.\n", name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1063 th_free(name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1064 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1065 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1066 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1067 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1068 printMsgQ(currWin, "Could not find username '%s'.\n", name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1069 return 1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1070 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1071 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1072 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1073 { |
472 | 1074 printMsgQ(currWin, |
1075 "Usage: /query username\n" | |
1076 "To close a PRV query, use /close [username]\n" | |
1077 "/close without username will close the current PRV window, if any.\n"); | |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1078 return 1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1079 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1080 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1081 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1082 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1083 int nncmd_close_query(th_conn_t *conn, char *name) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1084 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1085 (void) conn; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1086 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1087 if (name[0]) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1088 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1089 nn_window_t *win = nnwin_find(name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1090 if (win != NULL) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1091 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1092 nnwin_close(win); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1093 printMsgQ(currWin, "Closed PRV query to '%s'.\n", name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1094 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1095 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1096 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1097 printMsgQ(currWin, "No PRV query by name '%s'.\n", name); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1098 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1099 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1100 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1101 { |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
1102 if (currWin != nnwin_main_window()) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1103 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1104 nnwin_close(currWin); |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
1105 currWin = nnwin_main_window(); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1106 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1107 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1108 { |
472 | 1109 printMsgQ(currWin, |
1110 "Usage: /close [username]\n" | |
1111 "/close without username will close the current PRV window. if any.\n"); | |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1112 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1113 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1114 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1115 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1116 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1117 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1118 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1119 int nncmd_window_info(th_conn_t *conn, char *arg) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1120 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1121 (void) conn; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1122 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1123 if (arg[0]) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1124 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1125 int val = atoi(arg); |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
1126 nn_window_t *win = nnwin_get(val); |
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
1127 if (win != NULL) |
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
1128 currWin = win; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1129 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1130 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1131 printMsgQ(currWin, "Invalid window number '%s'\n", arg); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1132 return 1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1133 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1134 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1135 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1136 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1137 printMsgQ(currWin, "Window : #%d\n", currWin->num); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1138 printMsgQ(currWin, "ID : %s\n", currWin->id); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1139 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1140 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1141 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1142 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1143 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1144 int nncmd_list_all_users(th_conn_t *conn, char *buf) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1145 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1146 (void) buf; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1147 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1148 // Alias /listallusers |
425 | 1149 return nn_conn_send_msg(conn, optUserNameEnc, "%2Flistallusers"); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1150 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1151 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1152 |
486
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1153 #define NAME_NUM_PER_LINE 3 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1154 #define NAME_ENTRY_SIZE 64 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1155 #define NAME_ENTRY_WIDTH 22 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1156 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1157 typedef struct |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1158 { |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1159 char buf[(NAME_NUM_PER_LINE * NAME_ENTRY_SIZE) + 16]; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1160 size_t offs; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1161 int i, total; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1162 } nncmd_namedata_t; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1163 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1164 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1165 static int nncmd_names_do(const nn_user_t *user, void *data) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1166 { |
486
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1167 nncmd_namedata_t *d = data; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1168 char name[NAME_ENTRY_SIZE]; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1169 size_t len; |
538
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1170 int color; |
486
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1171 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1172 if (nn_check_name_list(setFriendList, user->name)) |
538
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1173 color = 11; |
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1174 else |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1175 if (nn_check_name_list(setIgnoreList, user->name)) |
538
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1176 color = 1; |
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1177 else |
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1178 color = 3; |
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1179 |
ffacb78d9b9f
Add colorization of usernames on userlist based on friend/ignore status.
Matti Hamalainen <ccr@tnsp.org>
parents:
536
diff
changeset
|
1180 snprintf(name, sizeof(name), "[½%d½%-20s½0½] ", color, user->name); |
486
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1181 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1182 d->total++; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1183 if (d->i >= NAME_NUM_PER_LINE) |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1184 { |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1185 printMsgQ(currWin, "%s\n", d->buf); |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1186 d->i = 0; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1187 d->offs = 0; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1188 } |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1189 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1190 len = strlen(name); |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1191 memcpy(d->buf + d->offs, name, len + 1); |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1192 d->offs += len; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1193 d->i++; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1194 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1195 return 0; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1196 } |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1197 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1198 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1199 int nncmd_names(th_conn_t *conn, char *arg) |
486
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1200 { |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1201 nncmd_namedata_t data; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1202 (void) conn; |
486
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1203 (void) arg; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1204 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1205 printMsgQ(currWin, "Users:\n"); |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1206 data.i = data.total = 0; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1207 data.offs = 0; |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1208 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1209 nn_userhash_foreach(nnUsers, nncmd_names_do, &data); |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1210 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1211 if (data.i > 0) |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1212 { |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1213 printMsgQ(currWin, "%s\n", data.buf); |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1214 } |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1215 |
d48327519b17
Implement /who / /names functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
481
diff
changeset
|
1216 printMsgQ(currWin, "%d users total.\n", data.total); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1217 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1218 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1219 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1220 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1221 int nncmd_save_config(th_conn_t *conn, char *buf) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1222 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1223 (void) conn; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1224 (void) buf; |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1225 th_ioctx_t ctx; |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1226 #ifndef __WIN32 |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1227 int cfgfd = -1; |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1228 #endif |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1229 |
565
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
1230 if (!th_ioctx_init(&ctx, setConfigFile, nn_ioctx_errfunc, nn_ioctx_msgfunc)) |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1231 { |
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1232 printMsgQ(currWin, "Could not initialize I/O context for configuration file writing!\n"); |
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1233 goto error; |
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1234 } |
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1235 |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1236 #ifdef __WIN32 |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1237 if ((ctx.fp = fopen(setConfigFile, "w")) == NULL) |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1238 #else |
577
06675b69ca6c
Add O_TRUNC to configuration file saving flags.
Matti Hamalainen <ccr@tnsp.org>
parents:
576
diff
changeset
|
1239 if ((cfgfd = open(setConfigFile, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)) == -1 || |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1240 (ctx.fp = fdopen(cfgfd, "w")) == NULL) |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1241 #endif |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1242 { |
621
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
1243 int err = th_get_error(); |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1244 printMsgQ(currWin, "Could not create configuration to file '%s', %d: %s\n", |
621
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
1245 setConfigFile, err, th_error_str(err)); |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1246 goto error; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1247 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1248 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1249 printMsgQ(currWin, "Configuration saved in file '%s', res=%d\n", |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1250 setConfigFile, th_cfg_write(&ctx, cfg)); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1251 |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1252 error: |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1253 th_ioctx_close(&ctx); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1254 return 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1255 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1256 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1257 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1258 int nncmd_quit(th_conn_t *conn, char *buf) |
573 | 1259 { |
1260 (void) conn; | |
1261 (void) buf; | |
1262 | |
1263 appQuitFlag = TRUE; | |
1264 return 0; | |
1265 } | |
1266 | |
1267 | |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1268 enum |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1269 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1270 CMDARG_NONE, |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1271 CMDARG_STRING, |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1272 CMDARG_OPTIONAL, |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1273 CMDARG_NICK, |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1274 }; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1275 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1276 typedef struct |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1277 { |
443 | 1278 char *name; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1279 int flags; |
431
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
1280 size_t len; |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1281 int (*handler)(th_conn_t *, char *buf); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1282 } nn_usercmd_t; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1283 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1284 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1285 static nn_usercmd_t userCmdsTable[] = |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1286 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1287 // Server side commands, we just implement completion |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1288 { "/me", CMDARG_STRING, 0, NULL }, |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1289 { "/status", CMDARG_STRING, 0, NULL }, |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1290 { "/list", CMDARG_NONE, 0, nncmd_list_all_users }, |
518 | 1291 { "/prvon", CMDARG_NONE, 0, NULL }, |
1292 { "/prvoff", CMDARG_NONE, 0, NULL }, | |
601
e661d7654e23
Add /mute to 'supported' passthrough commands.
Matti Hamalainen <ccr@tnsp.org>
parents:
599
diff
changeset
|
1293 { "/mute", CMDARG_STRING, 0, NULL }, |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1294 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1295 // List internal username list |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1296 { "/who", CMDARG_NONE, 0, nncmd_names }, |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1297 { "/names", CMDARG_NONE, 0, nncmd_names }, |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1298 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1299 { "/w", CMDARG_NICK, 0, nncmd_open_profile }, |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1300 { "/profile", CMDARG_NICK, 0, nncmd_open_profile }, |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1301 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1302 { "/query", CMDARG_NICK, 0, nncmd_open_query }, |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1303 { "/close", CMDARG_OPTIONAL, 0, nncmd_close_query }, |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1304 { "/win", CMDARG_OPTIONAL, 0, nncmd_window_info }, |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1305 |
497 | 1306 { "/ignore", CMDARG_OPTIONAL, 0, nncmd_ignore }, |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1307 { "/friend", CMDARG_OPTIONAL, 0, nncmd_friend }, |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1308 { "/color", CMDARG_STRING, 0, nncmd_set_color }, |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1309 { "/save", CMDARG_NONE, 0, nncmd_save_config }, |
573 | 1310 |
603
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
1311 { "/raw", CMDARG_STRING, 0, nncmd_send_raw }, |
0a30bf8db004
Add new command /raw for sending only once encoded data.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
1312 |
573 | 1313 { "/quit", CMDARG_NONE, 0, nncmd_quit }, |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1314 }; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1315 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1316 static qlist_t *userCmds = NULL; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1317 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1318 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1319 void nn_usercmd_init() |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1320 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1321 size_t i; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1322 for (i = 0; i < sizeof(userCmdsTable) / sizeof(userCmdsTable[0]); i++) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1323 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1324 th_llist_append(&userCmds, &userCmdsTable[i]); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1325 userCmdsTable[i].len = strlen(userCmdsTable[i].name); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1326 } |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1327 } |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1328 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1329 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1330 int nn_handle_command(th_conn_t *conn, char *buf) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1331 { |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1332 qlist_t *curr; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1333 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1334 for (curr = userCmds; curr != NULL; curr = curr->next) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1335 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1336 nn_usercmd_t *cmd = curr->data; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1337 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1338 if (!th_strncasecmp(buf, cmd->name, cmd->len)) |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1339 { |
457 | 1340 char *nbuf; |
1341 if (buf[cmd->len] != 0 && !th_isspace(buf[cmd->len])) | |
1342 continue; | |
1343 | |
1344 nbuf = str_trim_left(buf + cmd->len); | |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1345 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1346 switch (cmd->flags) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1347 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1348 case CMDARG_NICK: |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1349 case CMDARG_STRING: |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1350 if (!nbuf[0]) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1351 { |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1352 printMsgQ(currWin, "Command %s requires an argument.\n", cmd->name); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1353 return 1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1354 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1355 break; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1356 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1357 case CMDARG_NONE: |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1358 if (nbuf[0]) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1359 { |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1360 printMsgQ(currWin, "Command %s does not take arguments.\n", cmd->name); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1361 return 1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1362 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1363 break; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1364 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1365 case CMDARG_OPTIONAL: |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1366 break; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1367 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1368 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1369 // Check if there is a handler function |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1370 if (cmd->handler) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1371 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1372 // Internal commands have a handler |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1373 return cmd->handler(conn, nbuf); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1374 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1375 else |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1376 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1377 // Server-side commands are just pass-through here |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1378 char *tmp = nn_dblencode_str(buf); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1379 BOOL result; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1380 if (tmp == NULL) return -2; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1381 result = nn_conn_send_msg(conn, optUserNameEnc, tmp); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1382 th_free(tmp); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1383 return result ? 0 : -1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1384 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1385 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1386 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1387 |
444 | 1388 printMsgQ(currWin, "Unknown command: %s\n", buf); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1389 return 1; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1390 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1391 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1392 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1393 static nn_usercmd_t *nn_usercmd_match_do(qlist_t *list, const char *pattern, size_t len) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1394 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1395 qlist_t *node; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1396 for (node = list; node != NULL; node = node->next) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1397 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1398 nn_usercmd_t *cmd = node->data; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1399 if (len <= strlen(cmd->name) && th_strncasecmp(cmd->name, pattern, len) == 0) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1400 return cmd; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1401 } |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1402 return NULL; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1403 } |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1404 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1405 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1406 nn_usercmd_t *nn_usercmd_match(qlist_t *list, const char *pattern, const char *current, BOOL again) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1407 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1408 nn_usercmd_t *curr; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1409 size_t len; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1410 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1411 if (list == NULL || pattern == NULL) return NULL; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1412 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1413 len = strlen(pattern); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1414 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1415 if (current != NULL) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1416 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1417 qlist_t *node; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1418 for (node = list; node != NULL; node = node->next) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1419 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1420 curr = node->data; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1421 if (th_strcasecmp(curr->name, current) == 0) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1422 { |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1423 if (again) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1424 return curr; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1425 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1426 if ((curr = nn_usercmd_match_do(node->next, pattern, len)) != NULL) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1427 return curr; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1428 } |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1429 } |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1430 } |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1431 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1432 if ((curr = nn_usercmd_match_do(list, pattern, len)) != NULL) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1433 return curr; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1434 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1435 return NULL; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1436 } |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1437 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1438 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1439 int nn_handle_input(th_conn_t *conn, char *buf, size_t bufLen) |
0 | 1440 { |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
1441 BOOL result; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1442 char *tmp; |
391 | 1443 |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1444 // Trim right side |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1445 while (bufLen > 0 && th_isspace(buf[bufLen - 1])) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1446 buf[--bufLen] = 0; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1447 |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1448 if (buf[0] == 0) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1449 return 1; |
258 | 1450 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
1451 // Decode completed usernames |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
1452 nn_username_decode(buf); |
391 | 1453 |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1454 // Check for commands |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1455 if (buf[0] == '/') |
426 | 1456 return nn_handle_command(conn, buf); |
133 | 1457 |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1458 // If current window is not the main room window, send private |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
1459 if (currWin != nnwin_main_window()) |
391 | 1460 { |
1461 if (currWin->id != NULL) | |
1462 { | |
431
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
1463 char *msg = th_strdup_printf("/prv -to %s -msg %s", currWin->id, buf); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1464 if (msg == NULL) return -3; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1465 tmp = nn_dblencode_str(msg); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1466 if (tmp == NULL) |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1467 { |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1468 th_free(msg); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1469 return -2; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1470 } |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1471 result = nn_conn_send_msg(conn, optUserNameEnc, tmp); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1472 th_free(tmp); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1473 th_free(msg); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1474 return result ? 0 : -1; |
391 | 1475 } |
1476 else | |
1477 { | |
322
b9c15c57dc8f
Clean up message functions, add new printMsgQ() helper function for messages that should not
Matti Hamalainen <ccr@tnsp.org>
parents:
321
diff
changeset
|
1478 printMsgQ(NULL, "No target set, exiting prv mode.\n"); |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
1479 return 1; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
1480 } |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
1481 } |
291
cc2a1d837e7b
Window / buffer functionality works now. Queries work (with few minor glitches).
Matti Hamalainen <ccr@tnsp.org>
parents:
289
diff
changeset
|
1482 |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1483 // Send double-encoded message |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1484 tmp = nn_dblencode_str(buf); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1485 if (tmp == NULL) return -2; |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1486 result = nn_conn_send_msg(conn, optUserNameEnc, tmp); |
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
1487 th_free(tmp); |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
1488 return result ? 0 : -1; |
0 | 1489 } |
1490 | |
405 | 1491 |
449
7d9fa9f7caf1
Rename tab completion functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
448
diff
changeset
|
1492 static void nn_tabcomplete_replace(nn_editbuf_t *buf, size_t *pi, const size_t startPos, const size_t endPos, char *c) |
447
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1493 { |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1494 size_t i; |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1495 |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1496 for (i = startPos; i <= endPos; i++) |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1497 nn_editbuf_delete(buf, startPos); |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1498 |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1499 for (i = startPos; *c; i++, c++) |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1500 nn_editbuf_insert(buf, i, *c); |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1501 |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1502 *pi = i; |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1503 } |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1504 |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1505 |
449
7d9fa9f7caf1
Rename tab completion functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
448
diff
changeset
|
1506 static void nn_tabcomplete_finish(nn_editbuf_t *buf, char **previous, const size_t startPos, const char *name) |
447
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1507 { |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1508 nn_editbuf_setpos(buf, startPos + 1 + strlen(name)); |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1509 th_free(*previous); |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1510 *previous = th_strdup(name); |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1511 } |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1512 |
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1513 |
449
7d9fa9f7caf1
Rename tab completion functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
448
diff
changeset
|
1514 BOOL nn_tabcomplete_buffer(nn_editbuf_t *buf) |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
1515 { |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1516 static char *previous = NULL, *pattern = NULL; |
451 | 1517 char *str = buf->data; |
429
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1518 BOOL again = FALSE, hasSeparator = FALSE, |
447
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1519 hasSpace, newPattern = FALSE, isCommand; |
431
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
1520 size_t endPos, startPos = buf->pos; |
107
8037a3a7e491
Implement username tab-completion. It's still buggy, tho.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
1521 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
1522 // previous word |
391 | 1523 if (startPos >= 2 && str[startPos - 1] == ' ' && str[startPos - 2] != ' ') |
1524 { | |
113
2a53156e7e12
Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...)
Matti Hamalainen <ccr@tnsp.org>
parents:
112
diff
changeset
|
1525 startPos -= 2; |
2a53156e7e12
Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...)
Matti Hamalainen <ccr@tnsp.org>
parents:
112
diff
changeset
|
1526 endPos = startPos; |
2a53156e7e12
Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...)
Matti Hamalainen <ccr@tnsp.org>
parents:
112
diff
changeset
|
1527 while (startPos > 0 && str[startPos - 1] != ' ') startPos--; |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1528 } |
391 | 1529 else |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
1530 // middle of a word, new pattern |
404
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1531 if (startPos < buf->len && str[startPos] != ' ') |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1532 { |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1533 endPos = startPos; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1534 while (startPos > 0 && str[startPos - 1] != ' ') startPos--; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1535 while (endPos < buf->len - 1 && str[endPos + 1] != ' ') endPos++; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1536 newPattern = TRUE; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1537 } |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1538 else |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
1539 // previous word, new pattern |
404
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1540 if (startPos >= 1 && str[startPos - 1] != ' ') |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1541 { |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1542 startPos -= 1; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1543 endPos = startPos; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1544 while (startPos > 0 && str[startPos - 1] != ' ') startPos--; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1545 newPattern = TRUE; |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1546 } |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1547 else |
d11a68f214eb
Fix indentation after astyle reindent.
Matti Hamalainen <ccr@tnsp.org>
parents:
403
diff
changeset
|
1548 return FALSE; |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1549 |
429
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1550 // Check if this is a command completion |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1551 isCommand = (str[0] == '/' && startPos == 0); |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1552 |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1553 if (!isCommand && str[endPos] == optNickSep) |
391 | 1554 { |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1555 endPos--; |
391 | 1556 if (startPos > 0) |
113
2a53156e7e12
Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...)
Matti Hamalainen <ccr@tnsp.org>
parents:
112
diff
changeset
|
1557 return FALSE; |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1558 hasSeparator = TRUE; |
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1559 } |
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1560 |
451 | 1561 hasSpace = (buf->pos > 0 && str[buf->pos - 1] == ' ') || |
447
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1562 (buf->pos <= buf->len && str[buf->pos] == ' '); |
391 | 1563 |
1564 if (newPattern) | |
1565 { | |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
1566 // Get pattern, check if it matches previous pattern and set 'again' flag |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1567 char *npattern = nn_editbuf_get_string(buf, startPos, endPos); |
372
b9f0bdad6285
Use th_strcasecmp() and th_strncasecmp().
Matti Hamalainen <ccr@tnsp.org>
parents:
369
diff
changeset
|
1568 if (pattern && npattern && th_strcasecmp(npattern, pattern) == 0) |
116
741e45592522
Add simple "prediction" into tab-completion based on previously gotten last
Matti Hamalainen <ccr@tnsp.org>
parents:
115
diff
changeset
|
1569 again = TRUE; |
391 | 1570 |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1571 th_free(pattern); |
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1572 pattern = npattern; |
391 | 1573 |
1574 if (!again) | |
1575 { | |
116
741e45592522
Add simple "prediction" into tab-completion based on previously gotten last
Matti Hamalainen <ccr@tnsp.org>
parents:
115
diff
changeset
|
1576 th_free(previous); |
741e45592522
Add simple "prediction" into tab-completion based on previously gotten last
Matti Hamalainen <ccr@tnsp.org>
parents:
115
diff
changeset
|
1577 previous = NULL; |
741e45592522
Add simple "prediction" into tab-completion based on previously gotten last
Matti Hamalainen <ccr@tnsp.org>
parents:
115
diff
changeset
|
1578 } |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1579 } |
116
741e45592522
Add simple "prediction" into tab-completion based on previously gotten last
Matti Hamalainen <ccr@tnsp.org>
parents:
115
diff
changeset
|
1580 |
429
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1581 if (!pattern) |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1582 return FALSE; |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1583 |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1584 if (isCommand) |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1585 { |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1586 nn_usercmd_t *cmd = nn_usercmd_match(userCmds, pattern, previous, again); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1587 if (cmd) |
429
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1588 { |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1589 size_t i; |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1590 nn_tabcomplete_replace(buf, &i, startPos, endPos, cmd->name); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1591 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1592 if (!hasSpace) |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1593 nn_editbuf_insert(buf, i++, ' '); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1594 |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1595 nn_tabcomplete_finish(buf, &previous, startPos, cmd->name); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1596 return TRUE; |
429
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1597 } |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1598 } |
2ac24f1e241b
Start working on command completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
427
diff
changeset
|
1599 else |
391 | 1600 { |
446
3396acd40147
Rename and remove some functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1601 nn_user_t *user = nn_userhash_match(nnUsers, pattern, previous, again); |
107
8037a3a7e491
Implement username tab-completion. It's still buggy, tho.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
1602 |
391 | 1603 if (user) |
1604 { | |
431
a9b20b31cae1
More code cleanups, this time using clang with excessive warnings enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
430
diff
changeset
|
1605 size_t i; |
449
7d9fa9f7caf1
Rename tab completion functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
448
diff
changeset
|
1606 nn_tabcomplete_replace(buf, &i, startPos, endPos, user->name); |
107
8037a3a7e491
Implement username tab-completion. It's still buggy, tho.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
1607 |
391 | 1608 if (!hasSeparator && startPos == 0) |
1609 { | |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1610 nn_editbuf_insert(buf, i++, optNickSep); |
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1611 startPos++; |
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1612 } |
447
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1613 else |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1614 if (hasSeparator) |
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1615 startPos++; |
447
2d650408f5de
Modularize tab completion code a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
1616 |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1617 if (!hasSpace) |
113
2a53156e7e12
Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...)
Matti Hamalainen <ccr@tnsp.org>
parents:
112
diff
changeset
|
1618 nn_editbuf_insert(buf, i++, ' '); |
189
b0d64dde62af
Fix username tab completion. Should now work like in Irssi, though the
Matti Hamalainen <ccr@tnsp.org>
parents:
188
diff
changeset
|
1619 |
449
7d9fa9f7caf1
Rename tab completion functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
448
diff
changeset
|
1620 nn_tabcomplete_finish(buf, &previous, startPos, user->name); |
113
2a53156e7e12
Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...)
Matti Hamalainen <ccr@tnsp.org>
parents:
112
diff
changeset
|
1621 return TRUE; |
107
8037a3a7e491
Implement username tab-completion. It's still buggy, tho.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
1622 } |
8037a3a7e491
Implement username tab-completion. It's still buggy, tho.
Matti Hamalainen <ccr@tnsp.org>
parents:
104
diff
changeset
|
1623 } |
391 | 1624 |
113
2a53156e7e12
Yay, tab-completion cycling now works (except for usernames with whitespaces, of course ...)
Matti Hamalainen <ccr@tnsp.org>
parents:
112
diff
changeset
|
1625 return FALSE; |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
1626 } |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
1627 |
405 | 1628 |
513 | 1629 BOOL processUserInput(int c, nn_editbuf_t *editBuf, nn_editstate_t *editState) |
1630 { | |
1631 // Chat window switching via Meta/Esc-[1..9] | |
1632 if (c >= 0x5001 && c <= 0x5009) | |
1633 { | |
1634 nn_window_t *win = nnwin_get(c - 0x5000); | |
1635 if (win != NULL) | |
1636 { | |
1637 currWin = win; | |
1638 editState->update = TRUE; | |
1639 } | |
1640 } | |
1641 else | |
1642 switch (c) | |
1643 { | |
1644 case KEY_ENTER: | |
1645 // Call the user input handler | |
1646 if (editBuf->len > 0) | |
1647 { | |
1648 int result; | |
1649 | |
1650 if (editHistMax > 0) | |
1651 { | |
1652 nn_editbuf_free(editHistBuf[SET_MAX_HISTORY+1]); | |
1653 editHistBuf[SET_MAX_HISTORY+1] = NULL; | |
1654 memmove(&editHistBuf[2], &editHistBuf[1], | |
1655 editHistMax * sizeof(editHistBuf[0])); | |
1656 } | |
1657 | |
1658 editHistPos = 0; | |
1659 editHistBuf[1] = nn_editbuf_copy(editBuf); | |
1660 if (editHistMax < SET_MAX_HISTORY) | |
1661 editHistMax++; | |
1662 | |
1663 result = nn_handle_input(editState->conn, editBuf->data, editBuf->len); | |
1664 | |
1665 nn_editbuf_clear(editBuf); | |
1666 | |
1667 if (result < 0) | |
1668 { | |
1669 errorMsg("Fatal error handling user input: %s\n", editBuf->data); | |
1670 editState->isError = TRUE; | |
1671 } | |
1672 else | |
1673 { | |
1674 // Update time value of last sent message for unidle timeouts | |
1675 editState->prevKeepAlive = time(NULL); | |
1676 } | |
1677 } | |
1678 break; | |
1679 | |
1680 case KEY_NPAGE: | |
1681 case KEY_PPAGE: | |
1682 // Page Up / Page Down | |
1683 if (currWin != NULL) | |
1684 { | |
1685 int oldPos = currWin->pos, page = (scrHeight - 4) / 3; | |
1686 | |
1687 currWin->pos += (c == KEY_NPAGE) ? - page : page; | |
1688 | |
1689 if (currWin->pos >= currWin->data->n - page) | |
1690 currWin->pos = currWin->data->n - page; | |
1691 if (currWin->pos < 0) | |
1692 currWin->pos = 0; | |
1693 | |
1694 if (oldPos != currWin->pos) | |
1695 editState->update = TRUE; | |
1696 } | |
1697 break; | |
1698 | |
1699 case KEY_UP: // Backwards in input history | |
1700 if (editHistPos == 0) | |
1701 { | |
1702 nn_editbuf_free(editHistBuf[0]); | |
1703 editHistBuf[0] = nn_editbuf_copy(editBuf); | |
1704 } | |
1705 if (editHistPos < editHistMax) | |
1706 { | |
1707 editHistPos++; | |
1708 nn_editbuf_free(editBuf); | |
1709 editBuf = nn_editbuf_copy(editHistBuf[editHistPos]); | |
1710 } | |
1711 break; | |
1712 | |
1713 case KEY_DOWN: // Forwards in input history | |
1714 if (editHistPos > 0) | |
1715 { | |
1716 editHistPos--; | |
1717 nn_editbuf_free(editBuf); | |
1718 editBuf = nn_editbuf_copy(editHistBuf[editHistPos]); | |
1719 } | |
1720 break; | |
1721 | |
1722 case KEY_F(5): // F5 = Ignore mode | |
515 | 1723 setIgnoreMode = !setIgnoreMode; |
513 | 1724 printMsgQ(currWin, "Ignore mode = %s\n", setIgnoreMode ? "ON" : "OFF"); |
1725 break; | |
1726 | |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1727 case KEY_F(6): // F6 = Ignore mode |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1728 optOnlyFriendPrv = !optOnlyFriendPrv; |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1729 printMsgQ(currWin, "Only friends allowed to PRV you = %s\n", optOnlyFriendPrv ? "ON" : "OFF"); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1730 break; |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
1731 |
513 | 1732 case KEY_F(9): // F9 = Quit |
1733 printMsg(currWin, "Quitting per user request (%d/0x%x).\n", c, c); | |
571
3ae357fd34bb
Rename quit-related internal variables.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
1734 appQuitFlag = TRUE; |
513 | 1735 break; |
1736 | |
1737 case 0x09: // Tab = complete username or command | |
1738 nn_tabcomplete_buffer(editBuf); | |
1739 break; | |
1740 | |
1741 default: | |
1742 return FALSE; | |
1743 } | |
1744 | |
1745 return TRUE; | |
1746 } | |
1747 | |
1748 | |
1749 BOOL processUserPrompt(int c, nn_editbuf_t *editBuf, nn_editstate_t *editState) | |
1750 { | |
1751 (void) editBuf; | |
1752 | |
1753 switch (c) | |
1754 { | |
1755 case KEY_ENTER: | |
1756 editState->done = TRUE; | |
1757 break; | |
526
ba5807ebff88
Make it possible to quit when entering username/passwd.
Matti Hamalainen <ccr@tnsp.org>
parents:
521
diff
changeset
|
1758 |
ba5807ebff88
Make it possible to quit when entering username/passwd.
Matti Hamalainen <ccr@tnsp.org>
parents:
521
diff
changeset
|
1759 case KEY_F(9): // F9 = Quit |
ba5807ebff88
Make it possible to quit when entering username/passwd.
Matti Hamalainen <ccr@tnsp.org>
parents:
521
diff
changeset
|
1760 printMsg(currWin, "Quitting per user request (%d/0x%x).\n", c, c); |
571
3ae357fd34bb
Rename quit-related internal variables.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
1761 appQuitFlag = TRUE; |
526
ba5807ebff88
Make it possible to quit when entering username/passwd.
Matti Hamalainen <ccr@tnsp.org>
parents:
521
diff
changeset
|
1762 break; |
513 | 1763 |
1764 default: | |
1765 return FALSE; | |
1766 } | |
1767 | |
1768 return TRUE; | |
1769 } | |
1770 | |
1771 | |
1772 void updateUserPrompt(nn_editbuf_t *editBuf, nn_editstate_t *editState) | |
1773 { | |
1774 nnwin_update(editState->update, editState->mask, editBuf, optUserName, optUserColor); | |
1775 } | |
1776 | |
1777 | |
535
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1778 void clearEditState(nn_editstate_t *st) |
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1779 { |
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1780 memset(st, 0, sizeof(nn_editstate_t)); |
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1781 st->insertMode = TRUE; |
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1782 st->debugMsg = debugMsg; |
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1783 } |
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1784 |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1785 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1786 BOOL nn_log_open(nn_window_t *win) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1787 { |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1788 char *path = NULL; |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1789 #ifndef __WIN32 |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1790 int logFd = -1; |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1791 #endif |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1792 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1793 if (!optLogEnable) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1794 return FALSE; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1795 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1796 if (optLogPath != NULL) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1797 { |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1798 char *lt = strrchr(optLogPath, SET_DIR_SEPARATOR); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1799 if (lt == NULL || lt[1] != 0) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1800 path = th_strdup_printf("%s%c", optLogPath, SET_DIR_SEPARATOR); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1801 else |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1802 path = th_strdup(optLogPath); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1803 } |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1804 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1805 if (win->id == NULL) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1806 { |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1807 // Main window log (aka room log) |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1808 if (optLogDaily) |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1809 { |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1810 char stamp[64]; |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1811 str_get_timestamp(stamp, sizeof(stamp), "%Y-%m-%d"); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1812 win->logFilename = th_strdup_printf("%sroom_%d-%s%s", |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1813 path != NULL ? path : "", optPort, |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1814 stamp, optLogExtension); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1815 } |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1816 else |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1817 { |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1818 win->logFilename = th_strdup_printf("%sroom_%d%s", |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1819 path != NULL ? path : "", optPort, optLogExtension); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1820 } |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1821 } |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1822 else |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1823 { |
552 | 1824 // PRV chat log |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1825 size_t pos; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1826 char *cleaned; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1827 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1828 if ((cleaned = th_strdup(win->id)) == NULL) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1829 return FALSE; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1830 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1831 for (pos = 0; cleaned[pos] != 0; pos++) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1832 { |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1833 if (!isalnum(cleaned[pos])) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1834 cleaned[pos] = '_'; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1835 } |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1836 |
551
89fafb218396
Fix situations where the log path is unset.
Matti Hamalainen <ccr@tnsp.org>
parents:
550
diff
changeset
|
1837 win->logFilename = th_strdup_printf("%s%s%s", |
89fafb218396
Fix situations where the log path is unset.
Matti Hamalainen <ccr@tnsp.org>
parents:
550
diff
changeset
|
1838 path != NULL ? path : "", cleaned, optLogExtension); |
89fafb218396
Fix situations where the log path is unset.
Matti Hamalainen <ccr@tnsp.org>
parents:
550
diff
changeset
|
1839 |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1840 th_free(cleaned); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1841 } |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1842 |
552 | 1843 // Try to open the file for appending |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1844 if (win->logFilename == NULL) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1845 goto error; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1846 |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1847 #ifdef __WIN32 |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1848 if ((win->logFile = fopen(win->logFilename, "a")) == NULL) |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1849 #else |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1850 if ((logFd = open(win->logFilename, O_CREAT | O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR)) == -1 || |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1851 (win->logFile = fdopen(logFd, "a")) == NULL) |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1852 #endif |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1853 { |
621
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
1854 int err = th_get_error(); |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1855 errorMsg("Could not open logfile '%s' for appending, %d: %s\n", |
621
29b8ff5b625b
Use th_get_error() and th_error_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
620
diff
changeset
|
1856 win->logFilename, err, th_error_str(err)); |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1857 goto error; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1858 } |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1859 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1860 printMsg(win, "Logging to '%s'.\n", win->logFilename); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1861 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1862 th_free(path); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1863 return TRUE; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1864 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1865 error: |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1866 th_free(path); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1867 th_free(win->logFilename); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1868 win->logFilename = NULL; |
556
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1869 if (win->logFile != NULL) |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1870 fclose(win->logFile); |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1871 #ifndef __WIN32 |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1872 else |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1873 if (logFd >= 0) |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1874 close(logFd); |
9b72d0060b85
Create configuration and log files with reduced permissions (rw for user
Matti Hamalainen <ccr@tnsp.org>
parents:
555
diff
changeset
|
1875 #endif |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1876 return FALSE; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1877 } |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1878 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1879 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1880 void nn_log_close(nn_window_t *win) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1881 { |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1882 if (win->logFile != NULL) |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1883 fclose(win->logFile); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1884 win->logFile = NULL; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1885 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1886 th_free(win->logFilename); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1887 win->logFilename = NULL; |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1888 } |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1889 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
1890 |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1891 BOOL nn_log_reopen(nn_window_t *win) |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1892 { |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1893 nn_log_close(win); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1894 return nn_log_open(win); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1895 } |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1896 |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
1897 |
548
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1898 BOOL nn_stat_path(const char *path, BOOL *isDirectory, BOOL *isWritable, BOOL *isReadable) |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1899 { |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1900 #ifdef __WIN32 |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1901 DWORD attr = GetFileAttributes(path); |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1902 |
557
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
1903 *isDirectory = (attr & FILE_ATTRIBUTE_DIRECTORY) != 0; |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
1904 *isWritable = (attr & FILE_ATTRIBUTE_READONLY) == 0; |
548
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1905 *isReadable = TRUE; |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1906 #else |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1907 uid_t id = geteuid(); |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1908 struct stat sb; |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1909 if (stat(path, &sb) < 0) |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1910 return FALSE; |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1911 |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1912 *isDirectory = (S_ISDIR(sb.st_mode)); |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1913 *isWritable = (id == sb.st_uid && (sb.st_mode & S_IWUSR)); |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1914 *isReadable = (id == sb.st_uid && (sb.st_mode & S_IRUSR)); |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1915 #endif |
557
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
1916 |
560
1b2d434a651b
Comment out a debug message.
Matti Hamalainen <ccr@tnsp.org>
parents:
558
diff
changeset
|
1917 // THERR("'%s': dir=%d, wr=%d, rd=%d\n", path, *isDirectory, *isWritable, *isReadable); |
548
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1918 return TRUE; |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1919 } |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1920 |
28688eb812de
Add helper functions for checking if target path is writable, readable or directory and creating directory structures recursively.
Matti Hamalainen <ccr@tnsp.org>
parents:
546
diff
changeset
|
1921 |
550
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1922 BOOL nn_mkdir_rec(const char *cpath) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1923 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1924 char save, *path = th_strdup(cpath); |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1925 size_t start = 0, end; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1926 BOOL res = FALSE, exists, isDir, isWritable, isReadable; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1927 |
557
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
1928 THMSG(0, "Creating directory %s\n", cpath); |
550
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1929 do |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1930 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1931 for (save = 0, end = start; path[end] != 0; end++) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1932 if (path[end] == SET_DIR_SEPARATOR) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1933 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1934 save = path[end]; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1935 path[end] = 0; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1936 break; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1937 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1938 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1939 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1940 if (path[start] != 0) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1941 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1942 exists = nn_stat_path(path, &isDir, &isWritable, &isReadable); |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1943 if (exists && !isDir) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1944 goto error; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1945 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1946 if (!exists) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1947 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1948 #ifdef __WIN32 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1949 if (!CreateDirectory(path, NULL)) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1950 goto error; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1951 #else |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1952 if (mkdir(path, 0x1c9) < 0) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1953 goto error; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1954 #endif |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1955 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1956 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1957 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1958 path[end] = save; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1959 start = end + 1; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1960 } while (save != 0); |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1961 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1962 res = TRUE; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1963 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1964 error: |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1965 th_free(path); |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1966 return res; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1967 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1968 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1969 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1970 |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
1971 |
0 | 1972 int main(int argc, char *argv[]) |
1973 { | |
513 | 1974 char *tmpStr; |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
1975 int index, updateCount = 0, ret; |
513 | 1976 BOOL argsOK, colorSet = FALSE; |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
1977 th_conn_t *conn = NULL; |
168
2e4850ece456
Partially re-factor connection handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
165
diff
changeset
|
1978 nn_editbuf_t *editBuf = nn_editbuf_new(NN_TMPBUF_SIZE); |
513 | 1979 nn_editstate_t editState; |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
1980 th_cfgitem_t *tmpcfg; |
609
b10d81ddfc55
Use URI form of proxy configuration in the config file as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
1981 char *setHomeDir = NULL, *setProxyURI = NULL; |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
1982 |
513 | 1983 memset(editHistBuf, 0, sizeof(editHistBuf)); |
535
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
1984 clearEditState(&editState); |
391 | 1985 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
1986 // Initialize |
195
829457be9eea
Build system changes to support (in a big kludgy manner) icon and version information resource generation for Win32 binaries.
Matti Hamalainen <ccr@tnsp.org>
parents:
191
diff
changeset
|
1987 th_init("NNChat", "Newbie Nudes chat client", NN_VERSION, |
598 | 1988 "Written and designed by Anonymous Finnish Guy (C) 2008-2014", |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
1989 "This software is freeware, use and distribute as you wish."); |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
1990 th_verbosityLevel = 0; |
133 | 1991 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
1992 // Read configuration file |
148 | 1993 tmpcfg = NULL; |
133 | 1994 th_cfg_add_comment(&tmpcfg, "General settings"); |
1995 th_cfg_add_string(&tmpcfg, "username", &optUserName, NULL); | |
1996 th_cfg_add_string(&tmpcfg, "password", &optPassword, NULL); | |
409
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
1997 |
150
db5e7a1f1eb3
Add comment in config file about format of user color setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
149
diff
changeset
|
1998 th_cfg_add_comment(&tmpcfg, "Default color as a hex-triplet"); |
133 | 1999 th_cfg_add_hexvalue(&tmpcfg, "color", &optUserColor, optUserColor); |
391 | 2000 |
149
a4d6707161a7
Add config file option for default setting of ignore mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
148
diff
changeset
|
2001 th_cfg_add_comment(&tmpcfg, "Default setting of ignore mode"); |
151
303db1141147
Oops, should be th_cfg_add_bool() instead of th_cfg_add_boolean()
Matti Hamalainen <ccr@tnsp.org>
parents:
150
diff
changeset
|
2002 th_cfg_add_bool(&tmpcfg, "ignore", &setIgnoreMode, setIgnoreMode); |
149
a4d6707161a7
Add config file option for default setting of ignore mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
148
diff
changeset
|
2003 th_cfg_add_comment(&tmpcfg, "People to be ignored when ignore mode is enabled"); |
265
b9c650db8a6a
Rename variable nnIgnoreList to setIgnoreList.
Matti Hamalainen <ccr@tnsp.org>
parents:
264
diff
changeset
|
2004 th_cfg_add_string_list(&tmpcfg, "ignore_list", &setIgnoreList); |
264
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2005 |
519
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
2006 th_cfg_add_comment(&tmpcfg, "Allow only defined friends to private to you"); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
2007 th_cfg_add_bool(&tmpcfg, "prv_friends", &optOnlyFriendPrv, optOnlyFriendPrv); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
2008 th_cfg_add_comment(&tmpcfg, "List of your friends"); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
2009 th_cfg_add_string_list(&tmpcfg, "friend_list", &setFriendList); |
f17d2ab25618
Add option for only allowing private messages from people on a special friend list.
Matti Hamalainen <ccr@tnsp.org>
parents:
518
diff
changeset
|
2010 |
264
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2011 th_cfg_add_comment(&tmpcfg, "Random messages for idle timeout protection. If none are set, plain '.' is used."); |
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2012 th_cfg_add_string_list(&tmpcfg, "idle_messages", &setIdleMessages); |
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2013 |
409
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
2014 th_cfg_add_comment(&tmpcfg, "Character used as nickname auto-completion separator (default is ':')"); |
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
2015 th_cfg_add_string(&tmpcfg, "nick_separator", &optNickSepStr, NULL); |
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
2016 |
133 | 2017 th_cfg_add_section(&cfg, "general", tmpcfg); |
2018 | |
264
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2019 |
133 | 2020 tmpcfg = NULL; |
2021 th_cfg_add_comment(&tmpcfg, "Chat server hostname or IP address"); | |
2022 th_cfg_add_string(&tmpcfg, "host", &optServer, optServer); | |
593
00f476c65e1b
Remove port descriptions from configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
2023 |
00f476c65e1b
Remove port descriptions from configuration.
Matti Hamalainen <ccr@tnsp.org>
parents:
592
diff
changeset
|
2024 th_cfg_add_comment(&tmpcfg, "Default port to connect"); |
133 | 2025 th_cfg_add_int(&tmpcfg, "port", &optPort, optPort); |
2026 th_cfg_add_section(&cfg, "server", tmpcfg); | |
2027 | |
239
b7e7ed741a18
Add unfinished code for logfile name parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
2028 tmpcfg = NULL; |
609
b10d81ddfc55
Use URI form of proxy configuration in the config file as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
2029 th_cfg_add_comment(&tmpcfg, "Proxy URI (see comandline help for more information)"); |
b10d81ddfc55
Use URI form of proxy configuration in the config file as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
2030 th_cfg_add_string(&tmpcfg, "uri", &setProxyURI, NULL); |
353
83ae825bb8c1
Add configuration section for proxy settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
352
diff
changeset
|
2031 th_cfg_add_section(&cfg, "proxy", tmpcfg); |
83ae825bb8c1
Add configuration section for proxy settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
352
diff
changeset
|
2032 |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2033 |
353
83ae825bb8c1
Add configuration section for proxy settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
352
diff
changeset
|
2034 tmpcfg = NULL; |
239
b7e7ed741a18
Add unfinished code for logfile name parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
2035 th_cfg_add_comment(&tmpcfg, "Enable logging"); |
247 | 2036 th_cfg_add_bool(&tmpcfg, "enable", &optLogEnable, optLogEnable); |
554
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
2037 |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
2038 th_cfg_add_comment(&tmpcfg, "Use daily logfiles for room logs"); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
2039 th_cfg_add_bool(&tmpcfg, "daily", &optLogDaily, optLogDaily); |
13901e9be15b
Implement daily logs for room logs.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
2040 |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2041 th_cfg_add_comment(&tmpcfg, "Log files path"); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2042 th_cfg_add_string(&tmpcfg, "path", &optLogPath, optLogPath); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2043 |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2044 th_cfg_add_comment(&tmpcfg, "Log filename extension"); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2045 th_cfg_add_string(&tmpcfg, "extension", &optLogExtension, optLogExtension); |
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2046 |
247 | 2047 th_cfg_add_section(&cfg, "logging", tmpcfg); |
239
b7e7ed741a18
Add unfinished code for logfile name parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
233
diff
changeset
|
2048 |
512 | 2049 // Get home directory path |
154
e8f67e344aaf
Get correct directory for saving configuration under Windows.
Matti Hamalainen <ccr@tnsp.org>
parents:
153
diff
changeset
|
2050 { |
616
1ffacd20b88b
Clean up the #ifdef mess around homedir handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
2051 #if defined(__WIN32) |
391 | 2052 char tmpPath[MAX_PATH]; |
2053 if (SHGetFolderPath(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, tmpPath) == S_OK) | |
432
966c521e0954
Rename user home directory variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
431
diff
changeset
|
2054 setHomeDir = th_strdup(tmpPath); |
197
e0ec2280a778
Implement browser launching on Windows via ShellExecute().
Matti Hamalainen <ccr@tnsp.org>
parents:
196
diff
changeset
|
2055 |
391 | 2056 CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); |
616
1ffacd20b88b
Clean up the #ifdef mess around homedir handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
2057 #elif defined(USE_XDG) |
1ffacd20b88b
Clean up the #ifdef mess around homedir handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
2058 char *xdgConfigDir = getenv("XDG_CONFIG_HOME"); |
546 | 2059 |
2060 // If XDG is enabled, try the environment variable first | |
512 | 2061 if (xdgConfigDir != NULL) |
2062 setHomeDir = th_strdup(xdgConfigDir); | |
2063 else | |
546 | 2064 // Nope, try the obvious alternative |
616
1ffacd20b88b
Clean up the #ifdef mess around homedir handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
2065 setHomeDir = th_strdup_printf("%s/.config", getenv("HOME")); |
512 | 2066 #else |
616
1ffacd20b88b
Clean up the #ifdef mess around homedir handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
2067 setHomeDir = th_strdup(getenv("HOME")); |
512 | 2068 #endif |
2069 } | |
391 | 2070 |
432
966c521e0954
Rename user home directory variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
431
diff
changeset
|
2071 if (setHomeDir != NULL) |
391 | 2072 { |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
2073 th_ioctx_t ctx; |
541
44f67ec5e945
Improve logging facilities. Private chats in query windows are now logged
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
2074 setConfigFile = th_strdup_printf("%s%c%s", setHomeDir, SET_DIR_SEPARATOR, SET_CONFIG_FILE); |
154
e8f67e344aaf
Get correct directory for saving configuration under Windows.
Matti Hamalainen <ccr@tnsp.org>
parents:
153
diff
changeset
|
2075 |
e8f67e344aaf
Get correct directory for saving configuration under Windows.
Matti Hamalainen <ccr@tnsp.org>
parents:
153
diff
changeset
|
2076 THMSG(0, "Reading configuration from '%s'.\n", setConfigFile); |
e8f67e344aaf
Get correct directory for saving configuration under Windows.
Matti Hamalainen <ccr@tnsp.org>
parents:
153
diff
changeset
|
2077 |
565
de1af9652fef
Update to conform to changes in th-libs ioctx API.
Matti Hamalainen <ccr@tnsp.org>
parents:
564
diff
changeset
|
2078 if (th_ioctx_open(&ctx, setConfigFile, "r", nn_ioctx_errfunc, nn_ioctx_msgfunc)) |
391 | 2079 { |
561
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
2080 th_cfg_read(&ctx, cfg); |
1ff9e85a1fcc
Rework the configuration file loading and saving to use the I/O context and new th-config API.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
2081 th_ioctx_close(&ctx); |
315
864e6e52ed69
Fix a filehandle leak when reading in configuration file.
Matti Hamalainen <ccr@tnsp.org>
parents:
314
diff
changeset
|
2082 } |
133 | 2083 } |
196
edd5ce3e5399
Add simplistic username/password requester if none given on commandline or config file.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
2084 |
609
b10d81ddfc55
Use URI form of proxy configuration in the config file as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
2085 if (setProxyURI && !argHandleProxyURI(setProxyURI)) |
b10d81ddfc55
Use URI form of proxy configuration in the config file as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
2086 goto err_exit; |
b10d81ddfc55
Use URI form of proxy configuration in the config file as well.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
2087 |
546 | 2088 optNickSep = optNickSepStr ? optNickSepStr[0] : SET_NICK_SEPARATOR; |
409
4556174b5be8
Make nickname autocomplete separator configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
408
diff
changeset
|
2089 |
137
fad8c31e41e6
Move browser code around a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
2090 setBrowser = getenv("BROWSER"); |
fad8c31e41e6
Move browser code around a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
2091 if (setBrowser == NULL) |
fad8c31e41e6
Move browser code around a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
134
diff
changeset
|
2092 setBrowser = "firefox"; |
391 | 2093 |
545
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
2094 if (optLogPath == NULL) |
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
2095 { |
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
2096 optLogPath = th_strdup_printf("%s%c%s%c", |
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
2097 setHomeDir, SET_DIR_SEPARATOR, SET_LOG_DIR, SET_DIR_SEPARATOR); |
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
2098 } |
895ede06ff11
Implement default log file directory.
Matti Hamalainen <ccr@tnsp.org>
parents:
544
diff
changeset
|
2099 |
558
e32881ece842
Only try to create log directories if logging is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
557
diff
changeset
|
2100 if (optLogEnable) |
550
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2101 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2102 BOOL isDir, isWritable, isReadable; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2103 if (nn_stat_path(optLogPath, &isDir, &isWritable, &isReadable)) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2104 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2105 if (!isDir) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2106 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2107 THERR("The log file path '%s' is not a directory.\n", |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2108 optLogPath); |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2109 goto err_exit; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2110 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2111 else |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2112 if (!isWritable) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2113 { |
557
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2114 #ifdef __WIN32 |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2115 if (!nn_mkdir_rec(optLogPath)) |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2116 { |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2117 THERR("Could not create log file directory '%s'.\n", |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2118 optLogPath); |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2119 goto err_exit; |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2120 } |
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2121 #else |
550
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2122 THERR("The log file path '%s' is not writable.\n", |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2123 optLogPath); |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2124 goto err_exit; |
557
02244c553741
Fix Win32 side of log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
556
diff
changeset
|
2125 #endif |
550
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2126 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2127 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2128 else |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2129 if (!nn_mkdir_rec(optLogPath)) |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2130 { |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2131 THERR("Could not create log file directory '%s'.\n", |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2132 optLogPath); |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2133 goto err_exit; |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2134 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2135 } |
504a8b9297a3
Fix log directory creation.
Matti Hamalainen <ccr@tnsp.org>
parents:
549
diff
changeset
|
2136 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2137 // Parse command line arguments |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2138 argsOK = th_args_process(argc, argv, optList, optListN, |
391 | 2139 argHandleOpt, argHandleFile, FALSE); |
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
2140 |
391 | 2141 if (optUserNameCmd != NULL) |
2142 { | |
513 | 2143 THMSG(1, "Username set on commandline.\n"); |
198
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
2144 optUserName = optUserNameCmd; |
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
2145 optPassword = optPasswordCmd; |
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
2146 } |
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
2147 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2148 if (!argsOK) |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2149 return -2; |
64
6a3a917303e4
Some random cleanups, bring back WinSock support.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
2150 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2151 // Allocate userhash |
391 | 2152 if ((nnUsers = nn_userhash_new()) == NULL) |
2153 { | |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
2154 THERR("Could not allocate userhash. Fatal error.\n"); |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
2155 return -105; |
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
2156 } |
64
6a3a917303e4
Some random cleanups, bring back WinSock support.
Matti Hamalainen <ccr@tnsp.org>
parents:
63
diff
changeset
|
2157 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2158 // If no idle messages are set, add default |
391 | 2159 if (setIdleMessages == NULL) |
2160 { | |
264
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2161 th_llist_append(&setIdleMessages, th_strdup(".")); |
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2162 } |
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2163 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2164 // Initialize network |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
2165 if ((ret = th_network_init()) != THERR_OK) |
391 | 2166 { |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
2167 THERR("Could not initialize network subsystem: %s\n", th_error_str(ret)); |
91
acfc4b4bc180
Create network initialization functions in libnnchat and move Win32/WinSock code there.
Matti Hamalainen <ccr@tnsp.org>
parents:
90
diff
changeset
|
2168 goto err_exit; |
391 | 2169 } |
68
3ab7751fdad1
MingW compatibility, with one ugly kludge.
Matti Hamalainen <ccr@tnsp.org>
parents:
67
diff
changeset
|
2170 |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
2171 // Initialize curses windowing |
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
2172 if (!optDaemon && !nnwin_init(SET_DELAY)) |
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
2173 goto err_exit; |
391 | 2174 |
549
dd7b58eca06d
Use the helper functions for creating log file directory automatically.
Matti Hamalainen <ccr@tnsp.org>
parents:
548
diff
changeset
|
2175 |
571
3ae357fd34bb
Rename quit-related internal variables.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
2176 if (appCursesInit) |
501
ca88945d8eda
Begin work on integrating the removal of ncurses "windowing" and transition
Matti Hamalainen <ccr@tnsp.org>
parents:
497
diff
changeset
|
2177 { |
536
15e447d6a2a6
Fix to conform to th-libs changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
535
diff
changeset
|
2178 printMsg(NULL, "%s v%s - %s\n", th_prog_name, th_prog_version, th_prog_desc); |
513 | 2179 printMsg(NULL, "%s\n", th_prog_author); |
2180 printMsg(NULL, "%s\n", th_prog_license); | |
2181 | |
2182 nnwin_update(TRUE, FALSE, NULL, optUserName, optUserColor); | |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2183 |
513 | 2184 // Check if we have username and password |
2185 if (optUserName == NULL || optPassword == NULL) | |
2186 { | |
2187 printMsg(NULL, "Please enter your NN login credentials.\n"); | |
2188 printMsg(NULL, "You can avoid doing this every time by issuing '/save' after logging in.\n"); | |
2189 | |
2190 printMsg(NULL, "Enter your NN username ...\n"); | |
2191 optUserName = nnwin_prompt_requester(FALSE, &editState, processUserPrompt, updateUserPrompt); | |
571
3ae357fd34bb
Rename quit-related internal variables.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
2192 if (appQuitFlag) |
526
ba5807ebff88
Make it possible to quit when entering username/passwd.
Matti Hamalainen <ccr@tnsp.org>
parents:
521
diff
changeset
|
2193 goto err_exit; |
513 | 2194 |
2195 editState.mask = TRUE; | |
2196 printMsg(NULL, "Enter your NN password ...\n"); | |
2197 optPassword = nnwin_prompt_requester(TRUE, &editState, processUserPrompt, updateUserPrompt); | |
2198 editState.mask = FALSE; | |
571
3ae357fd34bb
Rename quit-related internal variables.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
2199 if (appQuitFlag) |
526
ba5807ebff88
Make it possible to quit when entering username/passwd.
Matti Hamalainen <ccr@tnsp.org>
parents:
521
diff
changeset
|
2200 goto err_exit; |
513 | 2201 } |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2202 } |
391 | 2203 |
2204 if (optUserName == NULL || optPassword == NULL) | |
2205 { | |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2206 errorMsg("Username and/or password not specified.\n"); |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2207 goto err_exit; |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2208 } |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2209 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2210 // Create a connection |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2211 conn = th_conn_new(nn_network_errfunc, nn_network_msgfunc); |
391 | 2212 if (conn == NULL) |
2213 { | |
354
c01e42fc9adb
More work on SOCKS proxy support, should work now.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
2214 errorMsg("Could not create connection structure.\n"); |
c01e42fc9adb
More work on SOCKS proxy support, should work now.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
2215 goto err_exit; |
c01e42fc9adb
More work on SOCKS proxy support, should work now.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
2216 } |
513 | 2217 |
2218 editState.conn = conn; | |
354
c01e42fc9adb
More work on SOCKS proxy support, should work now.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
2219 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2220 // Are we using a proxy? |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
2221 if (optProxyType != TH_PROXY_NONE && optProxyServer != NULL) |
391 | 2222 { |
602
4bae14092b78
Add parameters (unused for now) for proxy password etc. in case SOCKS 5
Matti Hamalainen <ccr@tnsp.org>
parents:
601
diff
changeset
|
2223 if (optProxyUserID == NULL) |
4bae14092b78
Add parameters (unused for now) for proxy password etc. in case SOCKS 5
Matti Hamalainen <ccr@tnsp.org>
parents:
601
diff
changeset
|
2224 optProxyUserID = "James Bond"; |
4bae14092b78
Add parameters (unused for now) for proxy password etc. in case SOCKS 5
Matti Hamalainen <ccr@tnsp.org>
parents:
601
diff
changeset
|
2225 |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2226 if (th_conn_set_proxy(conn, optProxyType, optProxyPort, optProxyServer, optProxyAuthType) != 0 || |
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2227 th_conn_set_proxy_auth_user(conn, optProxyUserID, optProxyPassword) != 0) |
391 | 2228 { |
354
c01e42fc9adb
More work on SOCKS proxy support, should work now.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
2229 errorMsg("Error setting proxy information.\n"); |
352
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
2230 goto err_exit; |
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
2231 } |
b54c8545dcb0
Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.
Matti Hamalainen <ccr@tnsp.org>
parents:
347
diff
changeset
|
2232 } |
391 | 2233 |
456
bb65460c7aa2
Clean up some initialization messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
451
diff
changeset
|
2234 // Okay, try to resolve the hostname |
354
c01e42fc9adb
More work on SOCKS proxy support, should work now.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
2235 conn->host = th_strdup(optServer); |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
2236 conn->hst = th_resolve_host(conn, optServer); |
391 | 2237 if (conn->hst == NULL) |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2238 goto err_exit; |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2239 |
329
c0988ab45afd
#ifdef out the policy probe.
Matti Hamalainen <ccr@tnsp.org>
parents:
328
diff
changeset
|
2240 #ifdef FINAL_BUILD |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2241 /* To emulate the official client, we first make a request for |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2242 * policy file, even though we don't use it for anything... |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2243 */ |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2244 if (th_conn_open(conn, 843, NULL) != 0) |
391 | 2245 { |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2246 errorMsg("Policy file request connection setup failed!\n"); |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2247 goto err_exit; |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2248 } |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2249 |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2250 tmpStr = "<policy-file-request/>"; |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2251 if (th_conn_send_buf(conn, tmpStr, strlen(tmpStr) + 1) == FALSE) |
391 | 2252 { |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2253 errorMsg("Failed to send policy file request.\n"); |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2254 goto err_exit; |
391 | 2255 } |
2256 else | |
2257 { | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2258 int cres = th_conn_pull(conn); |
624 | 2259 if (cres == TH_CONN_DATA_AVAIL) |
391 | 2260 { |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
2261 printMsg(currWin, "Probe got: %s\n", conn->buf); |
391 | 2262 } |
2263 else | |
2264 { | |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
2265 printMsg(currWin, "Could not get policy probe.\n"); |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2266 } |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2267 } |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2268 th_conn_free(conn); |
329
c0988ab45afd
#ifdef out the policy probe.
Matti Hamalainen <ccr@tnsp.org>
parents:
328
diff
changeset
|
2269 #endif |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2270 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2271 // Okay, now do the proper connection ... |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2272 if (th_conn_open(conn, optPort, NULL) != 0) |
391 | 2273 { |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2274 errorMsg("Main connection setup failed!\n"); |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2275 goto err_exit; |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2276 } |
391 | 2277 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2278 // Send login command |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2279 optUserNameEnc = nn_dblencode_str(optUserName); |
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2280 tmpStr = nn_dblencode_str(optSite); |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
2281 nn_conn_send_msg_v(conn, optUserNameEnc, "%%2Flogin%%20%%2Dsite%%20%s%%20%%2Dpassword%%20%s", tmpStr, optPassword); |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2282 th_free(tmpStr); |
391 | 2283 |
450
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
2284 // Initialize user commands |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
2285 nn_usercmd_init(); |
a8373a1ce1eb
Implement command tab completion.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
2286 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2287 // Initialize random numbers |
513 | 2288 editState.prevKeepAlive = time(NULL); |
2289 srandom((int) editState.prevKeepAlive); | |
100
ed4067c10a8a
Remove useless buffer usage from error reporting function.
Matti Hamalainen <ccr@tnsp.org>
parents:
98
diff
changeset
|
2290 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2291 // Enter mainloop |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2292 th_conn_reset(conn); |
571
3ae357fd34bb
Rename quit-related internal variables.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
2293 while (!editState.isError && !appQuitFlag) |
391 | 2294 { |
445
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2295 int retries = 3, cres; |
584
6d23385c0643
Prevent spurious screen updates.
Matti Hamalainen <ccr@tnsp.org>
parents:
582
diff
changeset
|
2296 editState.update = FALSE; |
445
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2297 |
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2298 packet_retry: |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2299 cres = th_conn_pull(conn); |
624 | 2300 if (cres == TH_CONN_DATA_AVAIL) |
439
70ea06294f3f
Possibly fix packet handling after the whole mess of refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
2301 { |
70ea06294f3f
Possibly fix packet handling after the whole mess of refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
2302 while (conn->ptr < conn->in_ptr && |
70ea06294f3f
Possibly fix packet handling after the whole mess of refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
2303 *(conn->in_ptr - 1) == 0 && |
513 | 2304 retries > 0 && !editState.isError) |
391 | 2305 { |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2306 // th_conn_dump_buffer(stderr, conn); |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
2307 int result = nn_parse_protocol(conn); |
436 | 2308 if (result == 0) |
2309 { | |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2310 th_conn_buf_skip(conn, 1); |
436 | 2311 } |
2312 else | |
385 | 2313 if (result > 0) |
2314 { | |
445
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2315 // Retry if possible |
439
70ea06294f3f
Possibly fix packet handling after the whole mess of refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
2316 if (--retries > 0) |
445
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2317 goto packet_retry; |
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2318 |
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2319 // Couldn't handle the message for some reason |
7e46f2f0ba34
Cleanup packet retrying a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
444
diff
changeset
|
2320 printMsg(currWin, "Could not handle: %s\n", conn->ptr); |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2321 th_conn_buf_skip(conn, strlen(conn->ptr) + 1); |
385 | 2322 } |
436 | 2323 else |
513 | 2324 editState.isError = TRUE; |
403
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
2325 } |
7bec02f382fb
Refactor the connection and protocol handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
2326 } |
439
70ea06294f3f
Possibly fix packet handling after the whole mess of refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
2327 else |
624 | 2328 if (cres < TH_CONN_ERROR || !th_conn_check(conn)) |
513 | 2329 editState.isError = TRUE; |
168
2e4850ece456
Partially re-factor connection handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
165
diff
changeset
|
2330 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2331 // Handle user input |
586
7c593c9303e8
Add another tiny screen update flush check.
Matti Hamalainen <ccr@tnsp.org>
parents:
584
diff
changeset
|
2332 BOOL flushed = FALSE; |
571
3ae357fd34bb
Rename quit-related internal variables.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
2333 if (appCursesInit) |
391 | 2334 { |
513 | 2335 nnwin_input_process(editBuf, &editState, processUserInput); |
2336 nnwin_update(editState.update, editState.mask, editBuf, optUserName, optUserColor); | |
586
7c593c9303e8
Add another tiny screen update flush check.
Matti Hamalainen <ccr@tnsp.org>
parents:
584
diff
changeset
|
2337 flushed = TRUE; |
513 | 2338 } |
391 | 2339 |
2340 if (++updateCount > 10) | |
2341 { | |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
2342 time_t tmpTime = time(NULL); |
513 | 2343 if (tmpTime - editState.prevKeepAlive > SET_KEEPALIVE) |
391 | 2344 { |
435
708a15fdf791
Fix a type / conversion related warning.
Matti Hamalainen <ccr@tnsp.org>
parents:
432
diff
changeset
|
2345 size_t n = ((size_t) random()) % th_llist_length(setIdleMessages); |
264
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2346 qlist_t *node = th_llist_get_nth(setIdleMessages, n); |
4c1c18a388d9
Add configuration setting and functionality for random "keepalive" messages to avoid idle timeout kicks from chat.
Matti Hamalainen <ccr@tnsp.org>
parents:
258
diff
changeset
|
2347 nn_conn_send_msg(conn, optUserNameEnc, node->data); |
513 | 2348 editState.prevKeepAlive = tmpTime; |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
2349 } |
391 | 2350 |
2351 if (!colorSet) | |
2352 { | |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
2353 colorSet = TRUE; |
424
aeb24b1b5e77
Refactor the /command handling completely.
Matti Hamalainen <ccr@tnsp.org>
parents:
422
diff
changeset
|
2354 nn_conn_send_msg_v(conn, optUserNameEnc, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor); |
96
7c9538e71c89
Add connection keepalive by sending /listallusers every 15 minutes,
Matti Hamalainen <ccr@tnsp.org>
parents:
92
diff
changeset
|
2355 } |
513 | 2356 |
586
7c593c9303e8
Add another tiny screen update flush check.
Matti Hamalainen <ccr@tnsp.org>
parents:
584
diff
changeset
|
2357 if (appCursesInit && !flushed) |
513 | 2358 { |
2359 nnwin_update(FALSE, editState.mask, editBuf, optUserName, optUserColor); | |
2360 } | |
391 | 2361 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2362 updateCount = 0; |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2363 } |
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2364 } |
391 | 2365 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
418
diff
changeset
|
2366 // 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
|
2367 err_exit: |
532
cfab338d3c9e
Stop to show errors when exiting even when not running on Win32.
Matti Hamalainen <ccr@tnsp.org>
parents:
531
diff
changeset
|
2368 if (errorMessages || editState.isError) |
521 | 2369 { |
2370 char *tmp; | |
2371 printMsg(NULL, "Press enter to exit.\n"); | |
535
379e361f1144
Fix various segfault issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
533
diff
changeset
|
2372 clearEditState(&editState); |
521 | 2373 tmp = nnwin_prompt_requester(FALSE, &editState, processUserPrompt, updateUserPrompt); |
2374 th_free(tmp); | |
2375 } | |
2376 | |
316
1065115665bd
Plug some more minor memory leaks.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
2377 th_cfg_free(cfg); |
432
966c521e0954
Rename user home directory variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
431
diff
changeset
|
2378 th_free(setHomeDir); |
316
1065115665bd
Plug some more minor memory leaks.
Matti Hamalainen <ccr@tnsp.org>
parents:
315
diff
changeset
|
2379 th_llist_free_func(setIdleMessages, th_free); |
103
eaa524e153f9
Initial implementation of functions for implementing tab-completion for user names.
Matti Hamalainen <ccr@tnsp.org>
parents:
100
diff
changeset
|
2380 nn_userhash_free(nnUsers); |
97
218efd2f0641
Rename functions for clarity.
Matti Hamalainen <ccr@tnsp.org>
parents:
96
diff
changeset
|
2381 nn_editbuf_free(editBuf); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
2382 |
466
796508f828f6
Refactor much of the "windowing" UI code into a new module, ui.[ch]
Matti Hamalainen <ccr@tnsp.org>
parents:
464
diff
changeset
|
2383 for (index = 0; index <= SET_MAX_HISTORY; index++) |
513 | 2384 nn_editbuf_free(editHistBuf[index]); |
288
e7ef3db3b954
Implement "windows" in the chat. Only main window used for now, and even
Matti Hamalainen <ccr@tnsp.org>
parents:
280
diff
changeset
|
2385 |
489
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
2386 nnwin_shutdown(); |
391 | 2387 |
268
d04ea4395e9e
Move username and password prompting into the Curses interface, also move Curses initialization to earlier phase.
Matti Hamalainen <ccr@tnsp.org>
parents:
267
diff
changeset
|
2388 #ifndef __WIN32 |
223
03af28fb1c38
Show error messages printed out to stderr only after the program has quit.
Matti Hamalainen <ccr@tnsp.org>
parents:
222
diff
changeset
|
2389 if (errorMessages) |
03af28fb1c38
Show error messages printed out to stderr only after the program has quit.
Matti Hamalainen <ccr@tnsp.org>
parents:
222
diff
changeset
|
2390 THERR("%s", errorMessages); |
222
a1fefbce0b7a
Add a simple 'press enter to continue' for Windows port, when an error occurs so the user can see it before the application closes.
Matti Hamalainen <ccr@tnsp.org>
parents:
221
diff
changeset
|
2391 #endif |
391 | 2392 |
198
21a37995c3fb
Make configuration username/password overridable on command line.
Matti Hamalainen <ccr@tnsp.org>
parents:
197
diff
changeset
|
2393 th_free(optUserNameEnc); |
622
bb6b07b44800
Network code is being generalized into a th-libs module.
Matti Hamalainen <ccr@tnsp.org>
parents:
621
diff
changeset
|
2394 th_conn_free(conn); |
623
118276b60667
More work towards using th-libs th_network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
622
diff
changeset
|
2395 th_network_close(); |
68
3ab7751fdad1
MingW compatibility, with one ugly kludge.
Matti Hamalainen <ccr@tnsp.org>
parents:
67
diff
changeset
|
2396 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2397 THMSG(1, "Connection terminated.\n"); |
391 | 2398 |
70
5228ad7b4f57
Remove tabs from indentation.
Matti Hamalainen <ccr@tnsp.org>
parents:
69
diff
changeset
|
2399 return 0; |
0 | 2400 } |