diff options
| author | Dirk Engling <erdgeist@erdgeist.org> | 2022-05-16 15:53:39 +0200 |
|---|---|---|
| committer | Dirk Engling <erdgeist@erdgeist.org> | 2022-05-16 15:53:39 +0200 |
| commit | d1ac67f6d73f24a165ccc008440bb8b208ae140f (patch) | |
| tree | 0da0184ec2273ffa6f642ab06e776fcdda9f4ac3 /vchat-commands.c | |
| parent | 43b74147212ddc5e619ac17dd1b5967b6b293d8a (diff) | |
Decouple IO openssl's BIO abstraction and split connection and tls handling to allow for other TLS libs
Diffstat (limited to 'vchat-commands.c')
| -rwxr-xr-x | vchat-commands.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vchat-commands.c b/vchat-commands.c index 06c9010..dc46b9c 100755 --- a/vchat-commands.c +++ b/vchat-commands.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | /* local includes */ | 26 | /* local includes */ |
| 27 | #include "vchat.h" | 27 | #include "vchat.h" |
| 28 | #include "vchat-connection.h" | ||
| 28 | #include "vchat-help.h" | 29 | #include "vchat-help.h" |
| 29 | #include "vchat-user.h" | 30 | #include "vchat-user.h" |
| 30 | 31 | ||
| @@ -146,7 +147,7 @@ dothink( char *tail, char nice ) | |||
| 146 | 147 | ||
| 147 | /* send users message to server */ | 148 | /* send users message to server */ |
| 148 | snprintf (tmpstr, TMPSTRSIZE, ".%c %s", nice, tail); | 149 | snprintf (tmpstr, TMPSTRSIZE, ".%c %s", nice, tail); |
| 149 | networkoutput (tmpstr); | 150 | vc_sendmessage (tmpstr); |
| 150 | 151 | ||
| 151 | /* show action in channel window */ | 152 | /* show action in channel window */ |
| 152 | snprintf (tmpstr, TMPSTRSIZE, nice == 'O' ? getformatstr(FS_TXPUBNTHOUGHT) : getformatstr(FS_TXPUBTHOUGHT), tail); | 153 | snprintf (tmpstr, TMPSTRSIZE, nice == 'O' ? getformatstr(FS_TXPUBNTHOUGHT) : getformatstr(FS_TXPUBTHOUGHT), tail); |
| @@ -163,7 +164,7 @@ doaction( char *tail ) | |||
| 163 | if( *tail ) { | 164 | if( *tail ) { |
| 164 | /* send users message to server */ | 165 | /* send users message to server */ |
| 165 | snprintf (tmpstr, TMPSTRSIZE, ".a %s", tail); | 166 | snprintf (tmpstr, TMPSTRSIZE, ".a %s", tail); |
| 166 | networkoutput (tmpstr); | 167 | vc_sendmessage (tmpstr); |
| 167 | 168 | ||
| 168 | /* show action in channel window */ | 169 | /* show action in channel window */ |
| 169 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_TXPUBACTION), own_nick_get(), tail); | 170 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_TXPUBACTION), own_nick_get(), tail); |
| @@ -194,7 +195,7 @@ privatemessagetx ( char *tail ) { | |||
| 194 | 195 | ||
| 195 | /* form message and send to server */ | 196 | /* form message and send to server */ |
| 196 | snprintf (tmpstr, TMPSTRSIZE, ".m %s %s", tail, mesg); | 197 | snprintf (tmpstr, TMPSTRSIZE, ".m %s %s", tail, mesg); |
| 197 | networkoutput (tmpstr); | 198 | vc_sendmessage (tmpstr); |
| 198 | 199 | ||
| 199 | /* show message in private window */ | 200 | /* show message in private window */ |
| 200 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_TXPRIVMSG), tail, mesg); | 201 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_TXPRIVMSG), tail, mesg); |
| @@ -254,7 +255,7 @@ handleline (char *line) | |||
| 254 | /* generic server command, send to server, show to user */ | 255 | /* generic server command, send to server, show to user */ |
| 255 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_COMMAND), line); | 256 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_COMMAND), line); |
| 256 | writechan (tmpstr); | 257 | writechan (tmpstr); |
| 257 | networkoutput (line); | 258 | vc_sendmessage (line); |
| 258 | break; | 259 | break; |
| 259 | } | 260 | } |
| 260 | break; | 261 | break; |
| @@ -274,7 +275,7 @@ output_default(char *line ) { | |||
| 274 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_TXPUBMSG), own_nick_get(), line); | 275 | snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_TXPUBMSG), own_nick_get(), line); |
| 275 | 276 | ||
| 276 | /* send original line to server */ | 277 | /* send original line to server */ |
| 277 | networkoutput (line); | 278 | vc_sendmessage (line); |
| 278 | 279 | ||
| 279 | /* output message to channel window */ | 280 | /* output message to channel window */ |
| 280 | writechan (tmpstr); | 281 | writechan (tmpstr); |
| @@ -430,7 +431,7 @@ command_quit(char *tail) | |||
| 430 | { | 431 | { |
| 431 | /* send users message to server */ | 432 | /* send users message to server */ |
| 432 | snprintf (tmpstr, TMPSTRSIZE, ".x %s", tail); | 433 | snprintf (tmpstr, TMPSTRSIZE, ".x %s", tail); |
| 433 | networkoutput (tmpstr); | 434 | vc_sendmessage (tmpstr); |
| 434 | 435 | ||
| 435 | /* show action in channel window */ | 436 | /* show action in channel window */ |
| 436 | writechan (tmpstr); | 437 | writechan (tmpstr); |
