src/irc_conn.c
author Tero Marttila <terom@fixme.fi>
Sun, 03 May 2009 17:15:45 +0300
branchnew-transport
changeset 163 27a112d89a73
parent 156 6534a4ac957b
child 171 b54f393c3df0
permissions -rw-r--r--
fix old usage of ERR_READ_EOF with ERR_EOF, and sock_gnutls typos/cleanup
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     1
#include "irc_conn.h"
21
0911d0b828d4 add basic log.c module
Tero Marttila <terom@fixme.fi>
parents: 20
diff changeset
     2
#include "irc_cmd.h"
39
a4891d71aca9 rename irc_nm to irc_proto, and move numerics from irc_cmd.h
Tero Marttila <terom@fixme.fi>
parents: 37
diff changeset
     3
#include "irc_proto.h"
22
c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log
Tero Marttila <terom@fixme.fi>
parents: 21
diff changeset
     4
#include "log.h"
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     5
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     6
#include <stdlib.h>
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     7
#include <string.h>
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
     8
#include <assert.h>
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     9
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    10
/**
45
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    11
 * Handle an async error on this IRC connection that we could not recover from any other way, the protocol is now dead,
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    12
 * and should be considered as destroyed after this returns.
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    13
 *
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    14
 * For conveniance, this returns the ERROR_CODE
21
0911d0b828d4 add basic log.c module
Tero Marttila <terom@fixme.fi>
parents: 20
diff changeset
    15
 */
45
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    16
static err_t irc_conn_set_error (struct irc_conn *conn, struct error_info *err)
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    17
{
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    18
    // notify user callback
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    19
    conn->callbacks.on_error(conn, err, conn->cb_arg);
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    20
45
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    21
    return ERROR_CODE(err);
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    22
}
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    23
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    24
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    25
/**
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    26
 * Update irc_conn.nickname
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    27
 */
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    28
static err_t irc_conn_set_nickname (struct irc_conn *conn, const char *nickname)
21
0911d0b828d4 add basic log.c module
Tero Marttila <terom@fixme.fi>
parents: 20
diff changeset
    29
{
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    30
    struct error_info err;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    31
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    32
    // strdup
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    33
    if ((conn->nickname = strdup(nickname)) == NULL) {
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    34
        SET_ERROR(&err, ERR_STRDUP);
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    35
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    36
        // notify
45
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now)
Tero Marttila <terom@fixme.fi>
parents: 39
diff changeset
    37
        return irc_conn_set_error(conn, &err);
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    38
    }
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    39
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    40
    // ok
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    41
    return SUCCESS;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    42
}
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    43
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    44
/**
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    45
 * 001 <nick> :Welcome to the Internet Relay Network <nick>!<user>@<host>
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    46
 */
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    47
static void on_RPL_WELCOME (const struct irc_line *line, void *arg)
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    48
{
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    49
    struct irc_conn *conn = arg;
24
08a26d0b9afd fix ret/err bug in irc_conn_send, supress unused-argument warnings
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    50
21
0911d0b828d4 add basic log.c module
Tero Marttila <terom@fixme.fi>
parents: 20
diff changeset
    51
    // update state
27
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
    52
    conn->registering = false;
21
0911d0b828d4 add basic log.c module
Tero Marttila <terom@fixme.fi>
parents: 20
diff changeset
    53
    conn->registered = true;
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    54
    
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    55
    // set our real nickname from the message target
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    56
    if (irc_conn_set_nickname(conn, line->args[0]))
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    57
        return;
22
c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log
Tero Marttila <terom@fixme.fi>
parents: 21
diff changeset
    58
27
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
    59
    // trigger callback
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
    60
    if (conn->callbacks.on_registered)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
    61
        conn->callbacks.on_registered(conn, conn->cb_arg);
21
0911d0b828d4 add basic log.c module
Tero Marttila <terom@fixme.fi>
parents: 20
diff changeset
    62
}
0911d0b828d4 add basic log.c module
Tero Marttila <terom@fixme.fi>
parents: 20
diff changeset
    63
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    64
/**
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    65
 * PING <server1> [ <server2> ]
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    66
 *
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    67
 * Send a 'PONG <server1>` reply right away.
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    68
 */ 
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    69
static void on_PING (const struct irc_line *line, void *arg)
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    70
{
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    71
    struct irc_conn *conn = arg;
24
08a26d0b9afd fix ret/err bug in irc_conn_send, supress unused-argument warnings
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    72
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    73
    // just reply
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    74
    irc_conn_PONG(conn, line->args[0]);
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    75
}
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
    76
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    77
/**
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    78
 * NICK <nickname>
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    79
 *
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    80
 * If the prefix is us, then update our nickname
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    81
 */
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    82
static void on_NICK (const struct irc_line *line, void *arg)
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    83
{
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    84
    struct irc_conn *conn = arg;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    85
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    86
    // ignore if it's not us
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 49
diff changeset
    87
    if (!line->source || irc_cmp_nick(line->source->nickname, conn->nickname))
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    88
        return;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    89
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    90
    // update our nickname
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 49
diff changeset
    91
    irc_conn_set_nickname(conn, line->args[0]);
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    92
}
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    93
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
    94
/**
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
    95
 * CTCP ACTION handler
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
    96
 */
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
    97
static void irc_conn_on_CTCP_ACTION (const struct irc_line *line, void *arg)
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
    98
{
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
    99
    struct irc_conn *conn = arg;
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   100
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   101
    // build the pseudo-line and invoke
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   102
    struct irc_line action_line = {
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   103
        .source     = line->source,
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   104
        .command    = "CTCP ACTION",
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   105
        .args       = {
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   106
            line->args[0],
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   107
            line->args[1],
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   108
            NULL
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   109
        }
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   110
    };
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   111
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   112
    // invoke the general command handlers
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   113
    irc_cmd_invoke(&conn->handlers, &action_line);
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   114
}
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   115
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   116
/**
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   117
 * Our command handlers
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   118
 */
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   119
static struct irc_cmd_handler irc_conn_handlers[] = {
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   120
    {   IRC_RPL_WELCOME,    &on_RPL_WELCOME     },
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   121
    {   "PING",             &on_PING            },
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   122
    {   "NICK",             &on_NICK            },
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   123
    {   NULL,               NULL,               },
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   124
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   125
}, irc_conn_ctcp_handlers[] = {
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   126
    {   "ACTION",                   &irc_conn_on_CTCP_ACTION        },
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   127
    {   NULL,                       NULL                            }
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   128
};
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   129
33
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   130
/**
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   131
 * Incoming CTCP message handler
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   132
 *
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   133
 * We only handle "simple" CTCP messages, i.e. those that begin and end with X-DELIM and contain a single tagged
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   134
 * extended message. The full range of CTCP quoting etc specified in the "offical" spec referenced below is not
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   135
 * implemented, as it is rarely used, or even implemented.
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   136
 *
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   137
 * http://www.irchelp.org/irchelp/rfc/ctcpspec.html
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   138
 */
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   139
static void irc_conn_on_CTCP (struct irc_conn *conn, const struct irc_line *line)
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   140
{
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   141
    // copy the message data into a mutable buffer
101
bb8ed1382103 fix off-by-one for end-NUL in strcpy bug
Tero Marttila <terom@fixme.fi>
parents: 97
diff changeset
   142
    char data_buf[strlen(line->args[1]) + 1], *data = data_buf;
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   143
    strcpy(data_buf, line->args[1]);
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   144
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   145
    // should only be called when this is true...
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   146
    assert(*data++ == '\001');
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   147
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   148
    // tokenize the extended message
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   149
    // XXX: do something with the trailing data?
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   150
    char *msg = strsep(&data, "\001");
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   151
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   152
    // parse the "command" tag
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   153
    char *tag = strsep(&msg, " ");
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   154
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   155
    // invalid if missing
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   156
    if (tag == NULL)
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   157
        return log_warn("CTCP message with no tag: '%s'", data);
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   158
    
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   159
    // parse the CTCP "line"
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   160
    struct irc_line ctcp_line = {
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   161
        // the sender of the message
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   162
        .source     = line->source,
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   163
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   164
        // the CTCP extended message tag
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   165
        .command    = tag,
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   166
        .args       = { 
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   167
            // the destination of the message
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   168
            line->args[0],
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   169
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   170
            // the rest of the CTCP extended message payload
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   171
            msg,
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   172
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   173
            NULL
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   174
        }
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   175
    };
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   176
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   177
    // invoke the CTCP command handlers
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   178
    irc_cmd_invoke(&conn->ctcp_handlers, &ctcp_line);
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   179
}
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   180
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   181
/**
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   182
 * Incoming line handler
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   183
 */
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   184
static void irc_conn_on_line (char *line_buf, void *arg) 
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   185
{
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   186
    struct irc_conn *conn = arg;
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   187
    struct irc_line line;
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 49
diff changeset
   188
    struct irc_nm nm;
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   189
    int err;
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   190
    
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   191
    // log
22
c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log
Tero Marttila <terom@fixme.fi>
parents: 21
diff changeset
   192
    log_debug("%s", line_buf);
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   193
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   194
    // parse
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 49
diff changeset
   195
    if ((err = irc_line_parse(&line, &nm, line_buf))) {
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   196
        log_warn("invalid line: %s: %s\n", line_buf, error_name(err));
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   197
        return;
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   198
    }
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   199
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   200
    // trap CTCP messages
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   201
    if (strcasecmp(line.command, "PRIVMSG") == 0 && line.args[1][0] == '\001')
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   202
        // parse and invoke the CTCP command handlers
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   203
        irc_conn_on_CTCP(conn, &line);
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   204
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   205
    else
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   206
        // invoke command handlers
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   207
        irc_cmd_invoke(&conn->handlers, &line);
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   208
}
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   209
33
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   210
/**
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   211
 * Transport failed
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   212
 */
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   213
static void irc_conn_on_error (struct error_info *err, void *arg)
33
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   214
{
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   215
    struct irc_conn *conn = arg;
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   216
48
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   217
    // EOF after quit?
163
27a112d89a73 fix old usage of ERR_READ_EOF with ERR_EOF, and sock_gnutls typos/cleanup
Tero Marttila <terom@fixme.fi>
parents: 156
diff changeset
   218
    if (ERROR_CODE(err) == ERR_EOF && conn->quitting) {
49
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT
Tero Marttila <terom@fixme.fi>
parents: 48
diff changeset
   219
        // udpate states
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT
Tero Marttila <terom@fixme.fi>
parents: 48
diff changeset
   220
        conn->registered = false;
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT
Tero Marttila <terom@fixme.fi>
parents: 48
diff changeset
   221
        conn->quitting = false;
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT
Tero Marttila <terom@fixme.fi>
parents: 48
diff changeset
   222
        conn->quit = true;
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT
Tero Marttila <terom@fixme.fi>
parents: 48
diff changeset
   223
48
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   224
        // callback
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   225
        if (conn->callbacks.on_quit)
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   226
            conn->callbacks.on_quit(conn, conn->cb_arg);
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   227
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   228
    } else {
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   229
        // log
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   230
        log_err_info(err, "line_proto error");
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   231
        
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   232
        // trash ourselves
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   233
        irc_conn_set_error(conn, err);
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   234
    }
33
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   235
}
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   236
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   237
static struct line_proto_callbacks irc_conn_lp_callbacks = {
32
ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct
Tero Marttila <terom@fixme.fi>
parents: 29
diff changeset
   238
    .on_line        = &irc_conn_on_line,
33
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up
Tero Marttila <terom@fixme.fi>
parents: 32
diff changeset
   239
    .on_error       = &irc_conn_on_error,
32
ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct
Tero Marttila <terom@fixme.fi>
parents: 29
diff changeset
   240
};
ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct
Tero Marttila <terom@fixme.fi>
parents: 29
diff changeset
   241
155
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   242
// XXX: ugly hack to get at an event_base
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   243
#include "sock_internal.h"
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   244
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   245
struct event_base **ev_base_ptr = &_sock_stream_ctx.ev_base;
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   246
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   247
err_t irc_conn_create (struct irc_conn **conn_ptr, transport_t *transport, const struct irc_conn_callbacks *callbacks, 
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   248
        void *cb_arg, error_t *err)
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   249
{
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   250
    struct irc_conn *conn;
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   251
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   252
    // alloc new state struct
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   253
    if ((conn = calloc(1, sizeof(struct irc_conn))) == NULL)
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   254
        return SET_ERROR(err, ERR_CALLOC);
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   255
27
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   256
    // init state
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   257
    conn->callbacks = *callbacks;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   258
    conn->cb_arg = cb_arg;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   259
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   260
    // initialize command handlers
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   261
    irc_cmd_init(&conn->handlers);
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   262
    irc_cmd_init(&conn->ctcp_handlers);
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   263
    
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   264
    // add the core handlers 
84
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   265
    if (
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   266
            (ERROR_CODE(err) = irc_cmd_add(&conn->handlers, irc_conn_handlers, conn))
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   267
        ||  (ERROR_CODE(err) = irc_cmd_add(&conn->ctcp_handlers, irc_conn_ctcp_handlers, conn))
2791bb73bbee implement some simple CTCP
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
   268
    )
28
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   269
        goto error;
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   270
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   271
    // create the line_proto, with our on_line handler
155
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   272
    if (line_proto_create(&conn->lp, transport, IRC_LINE_MAX * 1.5, &irc_conn_lp_callbacks, conn, err))
28
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   273
        goto error;
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   274
91
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   275
    // create the outgoing line queue
155
c59d3eaff0fb most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents: 150
diff changeset
   276
    if (irc_queue_create(&conn->out_queue, *ev_base_ptr, conn->lp, err))
91
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   277
        goto error;
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   278
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   279
    // ok
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   280
    *conn_ptr = conn;
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   281
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   282
    return SUCCESS;
28
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   283
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   284
error:
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   285
    // release
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   286
    irc_conn_destroy(conn);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   287
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   288
    return ERROR_CODE(err);    
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   289
}
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   290
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   291
void irc_conn_destroy (struct irc_conn *conn)
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   292
{
47
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test
Tero Marttila <terom@fixme.fi>
parents: 45
diff changeset
   293
    // the line_proto
28
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   294
    if (conn->lp)
156
6534a4ac957b add transport/sock/line_proto/etc code compiles
Tero Marttila <terom@fixme.fi>
parents: 155
diff changeset
   295
        line_proto_destroy(conn->lp);
91
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   296
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   297
    // the queue
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   298
    if (conn->out_queue)
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   299
        irc_queue_destroy(conn->out_queue);
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   300
    
47
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test
Tero Marttila <terom@fixme.fi>
parents: 45
diff changeset
   301
    // the command handlers
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   302
    irc_cmd_free(&conn->handlers);
91
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   303
    irc_cmd_free(&conn->ctcp_handlers);
28
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   304
47
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test
Tero Marttila <terom@fixme.fi>
parents: 45
diff changeset
   305
    // additional data
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test
Tero Marttila <terom@fixme.fi>
parents: 45
diff changeset
   306
    free(conn->nickname);
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test
Tero Marttila <terom@fixme.fi>
parents: 45
diff changeset
   307
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test
Tero Marttila <terom@fixme.fi>
parents: 45
diff changeset
   308
    // the irc_conn itself
28
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create
Tero Marttila <terom@fixme.fi>
parents: 27
diff changeset
   309
    free(conn);
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   310
}
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   311
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   312
err_t irc_conn_add_cmd_handlers (struct irc_conn *conn, struct irc_cmd_handler *handlers, void *arg)
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   313
{
37
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   314
    // use the irc_cmd stuff
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs
Tero Marttila <terom@fixme.fi>
parents: 33
diff changeset
   315
    return irc_cmd_add(&conn->handlers, handlers, arg);
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   316
}
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   317
27
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   318
err_t irc_conn_register (struct irc_conn *conn, const struct irc_conn_register_info *info)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   319
{
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   320
    err_t err;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   321
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   322
    if (conn->registering || conn->registered)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   323
        return ERR_IRC_CONN_REGISTER_STATE;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   324
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   325
    // send the initial messages
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   326
    if (
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   327
            (err = irc_conn_NICK(conn, info->nickname))
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   328
        ||  (err = irc_conn_USER(conn, info->username, info->realname))
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   329
    )
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   330
        return err;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   331
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   332
    // set state
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   333
    conn->registering = true;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   334
    
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   335
    // ok
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   336
    return SUCCESS;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   337
}
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered
Tero Marttila <terom@fixme.fi>
parents: 24
diff changeset
   338
150
e8018446b336 special-case recieved user-mode messages, add irc_conn_self function
Tero Marttila <terom@fixme.fi>
parents: 127
diff changeset
   339
bool irc_conn_self (struct irc_conn *conn, const char *nickname)
e8018446b336 special-case recieved user-mode messages, add irc_conn_self function
Tero Marttila <terom@fixme.fi>
parents: 127
diff changeset
   340
{
e8018446b336 special-case recieved user-mode messages, add irc_conn_self function
Tero Marttila <terom@fixme.fi>
parents: 127
diff changeset
   341
    return conn && nickname && conn->nickname && (irc_cmp_nick(conn->nickname, nickname) == 0);
e8018446b336 special-case recieved user-mode messages, add irc_conn_self function
Tero Marttila <terom@fixme.fi>
parents: 127
diff changeset
   342
}
e8018446b336 special-case recieved user-mode messages, add irc_conn_self function
Tero Marttila <terom@fixme.fi>
parents: 127
diff changeset
   343
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   344
err_t irc_conn_send (struct irc_conn *conn, const struct irc_line *line)
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   345
{
91
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   346
    // just proxy off to irc_quuee
bca23cbe1dce implement irc_queue for irc_conn, and add missing irc_queue_destroy, fix irc_conn_destroy
Tero Marttila <terom@fixme.fi>
parents: 84
diff changeset
   347
    return irc_queue_process(conn->out_queue, line);
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   348
}
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   349
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   350
err_t irc_conn_NICK (struct irc_conn *conn, const char *nickname)
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   351
{
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   352
    // NICK <nickname>
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   353
    struct irc_line line = {
97
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   354
        NULL, "NICK", { nickname }
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   355
    };
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   356
    
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   357
    return irc_conn_send(conn, &line);
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   358
}
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   359
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   360
err_t irc_conn_USER (struct irc_conn *conn, const char *username, const char *realname)
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   361
{
97
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   362
    // USER <user> <mode> * <realname>
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   363
    struct irc_line line = {
97
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   364
        NULL, "USER", { username, "0", "*", realname }
18
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   365
    };
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   366
    
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   367
    return irc_conn_send(conn, &line);
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   368
}
dedf137b504f add initial irc_conn code that can register
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   369
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   370
err_t irc_conn_PONG (struct irc_conn *conn, const char *target)
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   371
{
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   372
    // PONG <server> [ <server2> ]
29
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's
Tero Marttila <terom@fixme.fi>
parents: 28
diff changeset
   373
    // params are actually the wrong way around now, but nobody cares
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   374
    struct irc_line line = {
97
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   375
        NULL, "PONG", { target }
20
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   376
    };
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   377
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   378
    return irc_conn_send(conn, &line);
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   379
}
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups
Tero Marttila <terom@fixme.fi>
parents: 19
diff changeset
   380
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   381
err_t irc_conn_JOIN (struct irc_conn *conn, const char *channel)
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   382
{
97
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   383
    // JOIN (<channel> [ "," <channel> [ ... ] ]) [<key> [ "," <key> [ ... ] ] ]
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   384
    struct irc_line line = {
97
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   385
        NULL, "JOIN", { channel }
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   386
    };
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   387
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   388
    return irc_conn_send(conn, &line);
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   389
}
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   390
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   391
err_t irc_conn_PRIVMSG (struct irc_conn *conn, const char *target, const char *message)
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   392
{
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   393
    // PRIVMSG <msgtarget> <message>
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   394
    struct irc_line line = {
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   395
        NULL, "PRIVMSG", { target, message }
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   396
    };
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   397
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   398
    return irc_conn_send(conn, &line);
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   399
}
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 22
diff changeset
   400
127
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   401
err_t irc_conn_NOTICE (struct irc_conn *conn, const char *target, const char *message)
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   402
{
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   403
    // NOTICE <msgtarget> <message>
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   404
    struct irc_line line = {
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   405
        NULL, "NOTICE", { target, message }
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   406
    };
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   407
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   408
    return irc_conn_send(conn, &line);
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   409
}
94e6c3b4230f implement logwatch_on_line/logwatch_filter_apply, along with irc_*_NOTICE
Tero Marttila <terom@fixme.fi>
parents: 101
diff changeset
   410
48
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   411
err_t irc_conn_QUIT (struct irc_conn *conn, const char *message)
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   412
{
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   413
    err_t err;
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   414
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   415
    struct irc_line line = {
97
d3bc82ee76cb add irc_conn_PRIVMSG/irc_chan_PRIVMSG and lua bindings
Tero Marttila <terom@fixme.fi>
parents: 91
diff changeset
   416
        NULL, "QUIT", { message }
48
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   417
    };
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   418
    
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   419
    // state check
49
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT
Tero Marttila <terom@fixme.fi>
parents: 48
diff changeset
   420
    if (conn->quitting || conn->quit)
48
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   421
        return ERR_IRC_CONN_QUIT_STATE;
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   422
    
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   423
    // try and send
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   424
    if ((err = irc_conn_send(conn, &line)))
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   425
        return err;
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   426
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   427
    // mark as quitting
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   428
    conn->quitting = true;
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   429
    
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   430
    // ok
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   431
    return SUCCESS;
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   432
}
4841f4398fd2 add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents: 47
diff changeset
   433