From f86eac039f22848f26f9b45f7666834b7480c077 Mon Sep 17 00:00:00 2001 From: ChenLing Date: Wed, 9 Oct 2019 14:28:08 +0800 Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=A4=E8=AF=81=E2=80=94=E7=94=A8=E6=88=B7=E6=80=81?= =?UTF-8?q?hash=E8=A1=A8=E5=88=A0=E9=99=A4=E5=9C=A8=E7=BA=BF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BB=A3=E7=A0=81=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Achenling=20=E6=A3=80?= =?UTF-8?q?=E8=A7=86=E4=BA=BA=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/files/lighttpd/config/redirect.conf | 2 +- libs/src/lighttpd-1.4.51/src/mod_portal.c | 7 +++++- libs/src/lighttpd-1.4.51/src/user_hashtable.c | 22 ++++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/libs/files/lighttpd/config/redirect.conf b/libs/files/lighttpd/config/redirect.conf index 54baa5c9a..107d477cc 100644 --- a/libs/files/lighttpd/config/redirect.conf +++ b/libs/files/lighttpd/config/redirect.conf @@ -1,6 +1,6 @@ #var.log_root = "/home/cmhi/secogateway/libs/files/lighttpd/log" -var.server_root = "/home/cmhi/secogateway/libs/files/lighttpd" +var.server_root = "/usr/Product_usr/files/lighttpd" #var.state_dir = "/home/cmhi/secogateway/libs/files/lighttpd" #var.home_dir = "/home/cmhi/secogateway/libs/files/lighttpd" #var.conf_dir = "/home/cmhi/secogateway/libs/files/lighttpd/config" diff --git a/libs/src/lighttpd-1.4.51/src/mod_portal.c b/libs/src/lighttpd-1.4.51/src/mod_portal.c index b2e4b2a1c..637a13954 100644 --- a/libs/src/lighttpd-1.4.51/src/mod_portal.c +++ b/libs/src/lighttpd-1.4.51/src/mod_portal.c @@ -220,6 +220,7 @@ static handler_t judge_user_auth(server *srv, connection *con, void* p_d) in_port_t serverport = 0; in_port_t clientport = 0; char str[INET_ADDRSTRLEN]; + char dtr[INET_ADDRSTRLEN]; RESULT *uresult; uresult = ( RESULT *)malloc(sizeof(RESULT)); @@ -230,7 +231,11 @@ static handler_t judge_user_auth(server *srv, connection *con, void* p_d) log_error_write(srv, __FILE__, __LINE__, "s","test"); get_local_peer_ip(con->fd, &serverip, &clientip, &serverport, &clientport); - log_error_write(srv, __FILE__, __LINE__, "sdd","test", clientip, clientport); + + memset(dtr, 0, INET_ADDRSTRLEN); + inet_ntop(AF_INET, &clientip, dtr, sizeof(dtr)); + log_error_write(srv, __FILE__, __LINE__, "ssd","test", dtr, clientport); + /*通过用户IP判断用户是否认证通过*/ uinfo = ufind_user(clientip); diff --git a/libs/src/lighttpd-1.4.51/src/user_hashtable.c b/libs/src/lighttpd-1.4.51/src/user_hashtable.c index f71202171..aa4d56c9d 100644 --- a/libs/src/lighttpd-1.4.51/src/user_hashtable.c +++ b/libs/src/lighttpd-1.4.51/src/user_hashtable.c @@ -8,9 +8,11 @@ #include "user_hashtable.h" #include "user_auth.h" #include +#include "../../../Common/usermanager/ug_common.h" static server* g_svr = NULL; extern USER_AUTH_LIST g_user_auth_ret_table[]; +extern USERCACHE *shm_userauth_table; #if 0 /*链表全局变量 */ @@ -220,14 +222,25 @@ void udelete_user(int user_ip) if(NULL != pNode) { - /*查找用户ID，确认ID是否存在 */ - check_id = g_user_auth_ret_table[pNode->auth_user.user_id].group_id; + /*查找用户ID，确认ID是否存在 */ + check_id = shm_userauth_table[pNode->auth_user.user_id].authlist.group_id; + log_error_write(g_svr, __FILE__, __LINE__, "sd", "test", shm_userauth_table[pNode->auth_user.user_id].authlist.group_id); + log_error_write(g_svr, __FILE__, __LINE__, "sd", "test", check_id); if(check_id != 0) { hlist_del(&pNode->hnode); + log_error_write(g_svr, __FILE__, __LINE__, "s", "test"); } - + free(pNode); + + #if 0 + log_error_write(g_svr, __FILE__, __LINE__, "sdd", "test", pNode->auth_user.user_id, g_user_auth_ret_table[pNode->auth_user.user_id].group_id); + hlist_del(&pNode->hnode); + log_error_write(g_svr, __FILE__, __LINE__, "s", "test"); + free(pNode); + free(pNode); + #endif } } @@ -271,6 +284,9 @@ int uprintf_users() online_num++; log_error_write(g_svr, __FILE__, __LINE__, "sd", "test", online_num); inet_ntop(AF_INET, (void *)&(pNode->auth_user.user_ip), str, USERNAME_SIZE); + log_error_write(g_svr, __FILE__, __LINE__, "sssddddd", "test", str,pNode->auth_user.user_name, pNode->auth_user.user_id, + pNode->auth_user.group_id, pNode->auth_user.message_num,pNode->auth_user.byte_num, pNode->auth_user.online_time ); + printf("[%s %s %d %d %ld %ld %ld]\n", str, pNode->auth_user.user_name, pNode->auth_user.user_id, pNode->auth_user.group_id, pNode->auth_user.message_num,pNode->auth_user.byte_num, pNode->auth_user.online_time); }