fixed
This commit is contained in:
parent
a620a5d2d0
commit
718f290ba4
3 changed files with 176 additions and 46 deletions
99
C/irc.c
99
C/irc.c
|
@ -9,25 +9,27 @@
|
|||
#include <arpa/inet.h>
|
||||
#include "irc.h"
|
||||
|
||||
int IRCC_urecv(IRCC_client *irc) {
|
||||
int IRCC_urecv(IRCC_client *irc, char **buf, const size_t size) {
|
||||
#if defined(ENABLE_SSL) || defined(ENABLE_TLS)
|
||||
if (irc->irc_usingssl)
|
||||
return SSL_read(irc->irc_ssl, irc->irc_raw, sizeof(irc->irc_raw));
|
||||
return SSL_read(irc->irc_ssl, *buf, size);
|
||||
#endif
|
||||
|
||||
return recv(irc->irc_socket, irc->irc_raw, sizeof(irc->irc_raw), 0);
|
||||
return recv(irc->irc_socket, *buf, size, 0);
|
||||
}
|
||||
|
||||
int IRCC_usend(IRCC_client *irc, const char *msg, const size_t bytes) {
|
||||
int IRCC_usend(IRCC_client *irc, const char *msg, const size_t size) {
|
||||
#if defined(ENABLE_SSL) || defined(ENABLE_TLS)
|
||||
if (irc->irc_usingssl)
|
||||
return SSL_write(irc->irc_ssl, msg, bytes);
|
||||
return SSL_write(irc->irc_ssl, msg, size);
|
||||
#endif
|
||||
|
||||
return send(irc->irc_socket, msg, bytes, 0);
|
||||
return send(irc->irc_socket, msg, size, 0);
|
||||
}
|
||||
|
||||
int IRCC_connect(IRCC_client *irc, const char *ip, const int port) {
|
||||
memset(irc, 0, sizeof(IRCC_client));
|
||||
|
||||
struct hostent *hp = gethostbyname(ip);
|
||||
if (!hp)
|
||||
return IRCC_ERROR;
|
||||
|
@ -50,7 +52,7 @@ int IRCC_connect(IRCC_client *irc, const char *ip, const int port) {
|
|||
}
|
||||
|
||||
int status = connect(irc->irc_socket, (struct sockaddr *)&client_str, sizeof(client_str));
|
||||
if (status == -1) {
|
||||
if (status < 0) {
|
||||
close(irc->irc_socket);
|
||||
return IRCC_ERROR;
|
||||
}
|
||||
|
@ -60,8 +62,6 @@ int IRCC_connect(IRCC_client *irc, const char *ip, const int port) {
|
|||
}
|
||||
|
||||
void IRCC_parse_msg(char *tmp, IRCC_client *irc) {
|
||||
irc->irc_raw[strcspn(irc->irc_raw, "\r\n")] = '\0';
|
||||
|
||||
if (tmp != NULL) {
|
||||
/* Message */
|
||||
char *val = strchr(tmp, ':');
|
||||
|
@ -79,7 +79,7 @@ void IRCC_parse_msg(char *tmp, IRCC_client *irc) {
|
|||
val[0] = '\0';
|
||||
irc->irc_channel = val + 1;
|
||||
}
|
||||
|
||||
|
||||
/* Nickname */
|
||||
val = strchr(irc->irc_raw, '!');
|
||||
if (val != NULL) {
|
||||
|
@ -90,19 +90,43 @@ void IRCC_parse_msg(char *tmp, IRCC_client *irc) {
|
|||
}
|
||||
|
||||
int IRCC_recv(IRCC_client *irc) {
|
||||
memset(irc->irc_raw, '\0', IRCC_MSG_MAX);
|
||||
if (irc->irc_raw && irc->irc_alloc)
|
||||
free(irc->irc_raw);
|
||||
|
||||
int msg_size = IRCC_urecv(irc);
|
||||
if (msg_size <= 0)
|
||||
return IRCC_DISCONNECTED;
|
||||
irc->irc_raw = NULL;
|
||||
|
||||
char *ptr;
|
||||
if ((ptr = strstr(irc->irc_raw, "PING :")) != NULL) {
|
||||
*(strchr(ptr, 'I')) = 'O';
|
||||
if (IRCC_usend(irc, ptr, strlen(irc->irc_raw)) < 0)
|
||||
return IRCC_ERROR;
|
||||
size_t size = 0;
|
||||
char *buf = malloc(1);
|
||||
if (buf == NULL)
|
||||
return IRCC_ALLOC;
|
||||
|
||||
/* Read message chunk */
|
||||
char flag = 0;
|
||||
while (1) {
|
||||
size++;
|
||||
char *bckp = realloc(buf, size + 1);
|
||||
if (bckp == NULL) {
|
||||
free(buf);
|
||||
return IRCC_ALLOC;
|
||||
}
|
||||
buf = bckp;
|
||||
|
||||
char *ptr = buf + size - 1;
|
||||
int msg_size = IRCC_urecv(irc, &ptr, 1);
|
||||
if (msg_size <= 0) {
|
||||
free(buf);
|
||||
return IRCC_DISCONNECTED;
|
||||
}
|
||||
|
||||
*(ptr + 1) = '\0';
|
||||
if (flag)
|
||||
break;
|
||||
|
||||
if (*ptr == '\r')
|
||||
flag = 1;
|
||||
}
|
||||
|
||||
irc->irc_raw = buf;
|
||||
return IRCC_SUCCESS;
|
||||
}
|
||||
|
||||
|
@ -111,6 +135,15 @@ int IRCC_parse(IRCC_client *irc) {
|
|||
irc->irc_msg = NULL;
|
||||
irc->irc_nick = NULL;
|
||||
|
||||
char *ptr;
|
||||
if ((ptr = strstr(irc->irc_raw, "PING :")) != NULL) {
|
||||
*(strchr(ptr, 'I')) = 'O';
|
||||
if (IRCC_usend(irc, ptr, strlen(irc->irc_raw)) == -1)
|
||||
return IRCC_ERROR;
|
||||
|
||||
return IRCC_PING;
|
||||
}
|
||||
|
||||
/* Check end of motd */
|
||||
if (strstr(irc->irc_raw, "PRIVMSG ") == NULL && strstr(irc->irc_raw, "MOTD"))
|
||||
return IRCC_CONNECTED;
|
||||
|
@ -150,28 +183,32 @@ int IRCC_parse(IRCC_client *irc) {
|
|||
}
|
||||
|
||||
int IRCC_register(IRCC_client *irc, const char *nickname) {
|
||||
size_t bytes = snprintf(irc->irc_raw, sizeof(irc->irc_raw), "NICK %s\r\n", nickname);
|
||||
if (IRCC_usend(irc, irc->irc_raw, bytes) < 0)
|
||||
char buf[512];
|
||||
|
||||
int bytes = snprintf(buf, sizeof(buf) - 1, "NICK %s\r\n", nickname);
|
||||
if (IRCC_usend(irc, buf, bytes) < 0)
|
||||
return IRCC_ERROR;
|
||||
|
||||
bytes = snprintf(irc->irc_raw, sizeof(irc->irc_raw), "USER %s 0 localhost :%s\r\n", nickname, nickname);
|
||||
if (IRCC_usend(irc, irc->irc_raw, bytes) < 0)
|
||||
bytes = snprintf(buf, sizeof(buf) - 1, "USER %s 0 localhost :%s\r\n", nickname, nickname);
|
||||
if (IRCC_usend(irc, buf, bytes) < 0)
|
||||
return IRCC_ERROR;
|
||||
|
||||
return IRCC_SUCCESS;
|
||||
}
|
||||
|
||||
int IRCC_join(IRCC_client *irc, const char *channel, const char *key) {
|
||||
size_t bytes = snprintf(irc->irc_raw, sizeof(irc->irc_raw), "JOIN %s %s\r\n", channel, (key) ? key : "");
|
||||
if (IRCC_usend(irc, irc->irc_raw, bytes) < 0)
|
||||
char buf[512];
|
||||
ssize_t bytes = snprintf(buf, sizeof(buf) - 1, "JOIN %s %s\r\n", channel, (key) ? key : "");
|
||||
if (IRCC_usend(irc, buf, bytes) < 0)
|
||||
return IRCC_ERROR;
|
||||
|
||||
return IRCC_SUCCESS;
|
||||
}
|
||||
|
||||
int IRCC_send(IRCC_client *irc, const char *channel, const char *msg) {
|
||||
size_t bytes = snprintf(irc->irc_raw, sizeof(irc->irc_raw), "PRIVMSG %s :%s\r\n", channel, msg);
|
||||
if (IRCC_usend(irc, irc->irc_raw, bytes) < 0)
|
||||
char buf[512];
|
||||
ssize_t bytes = snprintf(buf, sizeof(buf) - 1, "PRIVMSG %s :%s\r\n", channel, msg);
|
||||
if (IRCC_usend(irc, buf, bytes) < 0)
|
||||
return IRCC_ERROR;
|
||||
|
||||
return IRCC_SUCCESS;
|
||||
|
@ -212,10 +249,12 @@ int IRCC_initssl(IRCC_client *irc) {
|
|||
}
|
||||
|
||||
void IRCC_close(IRCC_client *irc) {
|
||||
if (!irc->irc_alloc)
|
||||
return;
|
||||
if (irc->irc_alloc)
|
||||
free(irc->irc_raw);
|
||||
|
||||
if (irc->irc_connected)
|
||||
close(irc->irc_socket);
|
||||
|
||||
close(irc->irc_socket);
|
||||
irc->irc_msg = irc->irc_nick = irc->irc_channel = NULL;
|
||||
|
||||
#if defined(ENABLE_SSL) || defined(ENABLE_TLS)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue