--- lbbs/src/bbs_net.c 2025/10/05 00:49:56 1.61 +++ lbbs/src/bbs_net.c 2025/10/19 09:09:17 1.68 @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -193,71 +192,6 @@ void process_bar(int n, int len) iflush(); } -int bbsnet_io_buf_conv(iconv_t cd, char *p_buf, int *p_buf_len, int *p_buf_offset, char *p_conv, size_t conv_size, int *p_conv_len) -{ - char *in_buf; - char *out_buf; - size_t in_bytes; - size_t out_bytes; - int ret; - - in_buf = p_buf + *p_buf_offset; - in_bytes = (size_t)(*p_buf_len - *p_buf_offset); - out_buf = p_conv + *p_conv_len; - out_bytes = conv_size - (size_t)(*p_conv_len); - - while (in_bytes > 0) - { - ret = (int)iconv(cd, &in_buf, &in_bytes, &out_buf, &out_bytes); - if (ret == -1) - { - if (errno == EINVAL) // Incomplete - { -#ifdef _DEBUG - log_error("iconv(inbytes=%d, outbytes=%d) error: EINVAL\n", in_bytes, out_bytes); -#endif - *p_buf_len = (int)(p_buf + *p_buf_len - in_buf); - *p_buf_offset = 0; - *p_conv_len = (int)(conv_size - out_bytes); - memmove(p_buf, in_buf, (size_t)(*p_buf_len)); - - break; - } - else if (errno == E2BIG) - { - log_error("iconv(inbytes=%d, outbytes=%d) error: E2BIG\n", in_bytes, out_bytes); - return -1; - } - else if (errno == EILSEQ) - { - if (in_bytes > out_bytes || out_bytes <= 0) - { - log_error("iconv(inbytes=%d, outbytes=%d) error: EILSEQ and E2BIG\n", in_bytes, out_bytes); - return -2; - } - - *out_buf = *in_buf; - in_buf++; - out_buf++; - in_bytes--; - out_bytes--; - - continue; - } - } - else - { - *p_buf_len = 0; - *p_buf_offset = 0; - *p_conv_len = (int)(conv_size - out_bytes); - - break; - } - } - - return 0; -} - int bbsnet_connect(int n) { int sock, ret, loop, error; @@ -273,14 +207,15 @@ int bbsnet_connect(int n) int output_buf_len = 0; int input_buf_offset = 0; int output_buf_offset = 0; - iconv_t input_cd = NULL; char input_conv[LINE_BUFFER_LEN * 2]; char output_conv[LINE_BUFFER_LEN * 2]; int input_conv_len = 0; int output_conv_len = 0; int input_conv_offset = 0; int output_conv_offset = 0; + iconv_t input_cd = NULL; iconv_t output_cd = NULL; + char tocode[32]; struct epoll_event ev, events[MAX_EVENTS]; int nfds, epollfd; int stdin_read_wait = 0; @@ -291,6 +226,9 @@ int bbsnet_connect(int n) int tos; char remote_addr[IP_ADDR_LEN]; int remote_port; + char local_addr[IP_ADDR_LEN]; + int local_port; + socklen_t sock_len; time_t t_used = time(NULL); struct tm *tm_used; int ch; @@ -470,20 +408,35 @@ int bbsnet_connect(int n) log_error("setsockopt IP_TOS=%d error (%d)\n", tos, errno); } + sock_len = sizeof(sin); + if (getsockname(sock, (struct sockaddr *)&sin, &sock_len) < 0) + { + log_error("getsockname() error: %d", errno); + goto cleanup; + } + + strncpy(local_addr, inet_ntoa(sin.sin_addr), sizeof(local_addr) - 1); + local_addr[sizeof(local_addr) - 1] = '\0'; + local_port = ntohs(sin.sin_port); + prints("\033[1;31m连接成功！\033[m\r\n"); iflush(); - log_common("BBSNET connect to %s:%d\n", remote_addr, remote_port); + log_common("BBSNET connect to %s:%d from %s:%d by [%s]\n", + remote_addr, remote_port, local_addr, local_port, BBS_username); - input_cd = iconv_open(bbsnet_conf[n].charset, "UTF-8"); + snprintf(tocode, sizeof(tocode), "%s//TRANSLIT", bbsnet_conf[n].charset); + input_cd = iconv_open(tocode, stdio_charset); if (input_cd == (iconv_t)(-1)) { - log_error("iconv_open(UTF8->GBK) error: %d\n", errno); + log_error("iconv_open(%s->%s) error: %d\n", stdio_charset, tocode, errno); goto cleanup; } - output_cd = iconv_open("UTF-8", bbsnet_conf[n].charset); - if (input_cd == (iconv_t)(-1)) + + snprintf(tocode, sizeof(tocode), "%s//TRANSLIT", stdio_charset); + output_cd = iconv_open(stdio_charset, bbsnet_conf[n].charset); + if (output_cd == (iconv_t)(-1)) { - log_error("iconv_open(GBK->UTF-8) error: %d\n", errno); + log_error("iconv_open(%s->%s) error: %d\n", bbsnet_conf[n].charset, tocode, errno); iconv_close(input_cd); goto cleanup; } @@ -636,10 +589,10 @@ int bbsnet_connect(int n) { if (input_buf_offset < input_buf_len) { - ret = bbsnet_io_buf_conv(input_cd, input_buf, &input_buf_len, &input_buf_offset, input_conv, sizeof(input_conv), &input_conv_len); + ret = io_buf_conv(input_cd, input_buf, &input_buf_len, &input_buf_offset, input_conv, sizeof(input_conv), &input_conv_len); if (ret < 0) { - log_error("bbsnet_io_buf_conv(input, %d, %d, %d) error\n", input_buf_len, input_buf_offset, input_conv_len); + log_error("io_buf_conv(input, %d, %d, %d) error\n", input_buf_len, input_buf_offset, input_conv_len); } } @@ -731,10 +684,10 @@ int bbsnet_connect(int n) { if (output_buf_offset < output_buf_len) { - ret = bbsnet_io_buf_conv(output_cd, output_buf, &output_buf_len, &output_buf_offset, output_conv, sizeof(output_conv), &output_conv_len); + ret = io_buf_conv(output_cd, output_buf, &output_buf_len, &output_buf_offset, output_conv, sizeof(output_conv), &output_conv_len); if (ret < 0) { - log_error("bbsnet_io_buf_conv(output, %d, %d, %d) error\n", output_buf_len, output_buf_offset, output_conv_len); + log_error("io_buf_conv(output, %d, %d, %d) error\n", output_buf_len, output_buf_offset, output_conv_len); } } @@ -883,8 +836,6 @@ int bbs_net() load_bbsnet_conf(CONF_BBSNET); - BBS_last_access_tm = time(NULL); - clearscr(); bbsnet_refresh(); display_menu(&bbsnet_menu); @@ -894,20 +845,27 @@ int bbs_net() { ch = igetch(100); + if (ch != KEY_NULL && ch != KEY_TIMEOUT) + { + BBS_last_access_tm = time(NULL); + } + switch (ch) { case KEY_NULL: // broken pipe - case KEY_ESC: - case Ctrl('C'): // user cancel + log_error("KEY_NULL\n"); goto cleanup; case KEY_TIMEOUT: if (time(NULL) - BBS_last_access_tm >= MAX_DELAY_TIME) { + log_error("User input timeout\n"); goto cleanup; } continue; + case KEY_ESC: + case Ctrl('C'): // user cancel + goto cleanup; case CR: - igetch_reset(); bbsnet_connect(bbsnet_menu.menu_item_pos[0]); bbsnet_refresh(); display_menu(&bbsnet_menu); @@ -950,7 +908,6 @@ int bbs_net() bbsnet_selchange(); break; } - BBS_last_access_tm = time(NULL); } cleanup: