[Netadm-devel] gwc/gwcadmd main.c,1.7,1.8
Status: Beta
Brought to you by:
linuxpark
Menu
▾
▴
[Netadm-devel] gwc/gwcadmd main.c,1.7,1.8
|
From: linuxpark <lin...@us...> - 2006-03-06 14:16:12
|
Update of /cvsroot/netadm/gwc/gwcadmd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12384/gwcadmd Modified Files: main.c Log Message: ADD: Almost all is being finished in user layer for supporting more detailed pf rule. Except packet filter layer ("apply" function & ioctl & pf.c) FIX: policy cache concerned problem was fixed. ADD: cache lock FIX: socket error (it was stemed from wrong fd) Index: main.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcadmd/main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** main.c 6 Mar 2006 04:23:56 -0000 1.7 --- main.c 6 Mar 2006 14:16:05 -0000 1.8 *************** *** 22,29 **** #include <pthread.h> #include <strings.h> - #ifndef _GNU_SOURCE - #define _GNU_SOURCE - #include <string.h> - #endif #include <signal.h> #include <errno.h> --- 22,25 ---- *************** *** 385,390 **** --- 381,389 ---- static int ridx[MAXSHM_RADIO]; + + #if 0 static int radio_idx[MAXSHM_RADIO]; static int radio_type[MAXSHM_RADIO]; + #endif static void *get_ifinfo(void *arg) *************** *** 624,629 **** dt = (double)Ttot / ((lv - iv) > 0 ? (lv - iv) : (iv - lv)); - dprintf("type: %d state: %d dt: %d, iv:%d, lv:%d\n", type, state, dt, iv, lv); - if (type == PWTYPE_APPLY) { while (!opendoor) ; --- 623,626 ---- *************** *** 651,658 **** } HI(); - dprintf("out while type: %d, Tremain:%d dt: %d\n", type, Tremain, dt); while (Tremain >= dt) { sys_delay(dt); - dprintf("in while type: %d, Tremain:%d dt: %d\n", type, Tremain, dt); switch (type) { case PWTYPE_CCK: --- 648,653 ---- *************** *** 666,671 **** pwvar.changed = TRUE; pthread_mutex_unlock(&autotest_mutex); ! out("Time remain: %d, dt: %d CCK Power changed :%d\n", Tremain, dt, pwvar.cck); break; case PWTYPE_OFDM: --- 661,668 ---- pwvar.changed = TRUE; pthread_mutex_unlock(&autotest_mutex); ! #if 0 ! out("Time remain: %d, dt: %d CCK Power changed :%.f\n", Tremain, dt, pwvar.cck); + #endif break; case PWTYPE_OFDM: *************** *** 679,684 **** --- 676,683 ---- pwvar.changed = TRUE; pthread_mutex_unlock(&autotest_mutex); + #if 0 out("Time remain: %d, dt: %d OFDM Power changed :%d\n", Tremain, dt, pwvar.ofdm); + #endif break; case PWTYPE_CLIENT: *************** *** 692,696 **** --- 691,697 ---- pwvar.changed = TRUE; pthread_mutex_unlock(&autotest_mutex); + #if 0 out("Time remain: %d, dt: %d Client Power changed :%d\n", Tremain, dt, pwvar.client); + #endif break; default: *************** *** 824,827 **** --- 825,829 ---- /* TODO : more info */ + LIST_LOCK (runpol_list); LIST_LOOP(runpol_list, p, n) { saddr.s_addr = p->msg.saddr; *************** *** 843,846 **** --- 845,849 ---- ); } + LIST_UNLOCK (runpol_list); fclose (fp); } *************** *** 913,917 **** if (emsg != NULL && strlen (emsg)) strcpy (ipcret->errmsg, emsg); ! //if ((iret = sys_write (fd, (void *)ipcret, sizeof (sys_ipc_ret_t), IPC_TIMEOUT)) < 0 ) { if ((iret = write (fd, (void *)ipcret, sizeof (sys_ipc_ret_t))) < 0 ) { out("write error:%s\n", strerror(errno)); --- 916,920 ---- if (emsg != NULL && strlen (emsg)) strcpy (ipcret->errmsg, emsg); ! if ((iret = write (fd, (void *)ipcret, sizeof (sys_ipc_ret_t))) < 0 ) { out("write error:%s\n", strerror(errno)); *************** *** 930,934 **** --- 933,940 ---- int c; int errflag = 0; + #ifdef USE_SYSLOG + char *cp; char ident[MINBUF]; + #endif extern char *optarg; extern int optind; *************** *** 936,940 **** int len; pthread_t pid; - char *cp; int fd; fd_set sock_set; --- 942,945 ---- *************** *** 1015,1021 **** goto EXIT; } - runpol_list->del = destory_runpol; if ((loadconf(csm, SZMASTCONF)) != RET_OK) { out("Cannot load configuration\n"); --- 1020,1026 ---- goto EXIT; } runpol_list->del = destory_runpol; + out("starting...\n"); if ((loadconf(csm, SZMASTCONF)) != RET_OK) { out("Cannot load configuration\n"); *************** *** 1036,1040 **** (void)signal(SIGCHLD, SIG_IGN); (void)signal(SIGPIPE, SIG_IGN); - out("starting...\n"); getif_info(1); --- 1041,1044 ---- *************** *** 1056,1060 **** } - if ((fd = sys_ipclisten()) < 0) { out("Failed to sys_ipclisten\n"); --- 1060,1063 ---- *************** *** 1109,1119 **** } else if (!ret) { out("timeout continue ...\n"); - /* TODO: delete me later */ - show_runpol(); continue; } else { if ( FD_ISSET(fd, &sock_set)) { - out ("get client\n"); cli_len = sizeof(cli_addr); --- 1112,1119 ---- *************** *** 1123,1127 **** continue; } - out ("success to accept client\n"); if ((ret = read(cli, (char *)ipcmsg, MAXBUF))<0 ) { --- 1123,1126 ---- *************** *** 1129,1133 **** out ("%s\n", minbuf); ! if ( send_rmsg (fd, ret, minbuf) != RET_OK ) out ("Failed to send_rmesg\n"); --- 1128,1132 ---- out ("%s\n", minbuf); ! if ( send_rmsg (cli, ret, minbuf) != RET_OK ) out ("Failed to send_rmesg\n"); *************** *** 1135,1145 **** } - out ("success to read client\n"); - switch ( ipcmsg->type ) { case IPCMTYPE_FC_ADD_IPOL: - out ("type: add pol(%s)\n", ipcmsg->data); if (!sys_ucmd_msg ( _CMD_ADD_FC_IPOL, ipcmsg->data, ipcmsg->len, fr)) { sprintf (minbuf, "Failed to add ipol \"%s\" (%d); %s", --- 1134,1141 ---- *************** *** 1147,1151 **** out ("%s\n", minbuf); ! if (send_rmsg (fd, fr->ret, minbuf) != RET_OK) out ("Failed to send_rmesg\n"); --- 1143,1147 ---- out ("%s\n", minbuf); ! if (send_rmsg (cli, fr->ret, minbuf) != RET_OK) out ("Failed to send_rmesg\n"); *************** *** 1154,1158 **** sprintf (minbuf, "Success to add ipol \"%s\"", (char *)ipcmsg->data); out ("%s\n", minbuf); ! if (send_rmsg (fd, fr->ret, minbuf) !=RET_OK) out ("Failed to send_rmesg\n"); } --- 1150,1154 ---- sprintf (minbuf, "Success to add ipol \"%s\"", (char *)ipcmsg->data); out ("%s\n", minbuf); ! if (send_rmsg (cli, fr->ret, minbuf) !=RET_OK) out ("Failed to send_rmesg\n"); } *************** *** 1160,1164 **** case IPCMTYPE_FC_DEL_IPOL: - out ("type: del pol\n"); if (!sys_ucmd_msg ( _CMD_DEL_FC_IPOL, ipcmsg->data,ipcmsg->len, fr)) { --- 1156,1159 ---- *************** *** 1167,1171 **** out ("%s\n", minbuf); ! if (send_rmsg (fd, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); --- 1162,1166 ---- out ("%s\n", minbuf); ! if (send_rmsg (cli, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); *************** *** 1175,1179 **** out ("%s\n", minbuf); ! if (send_rmsg (fd, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); } --- 1170,1174 ---- out ("%s\n", minbuf); ! if (send_rmsg (cli, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); } *************** *** 1187,1191 **** out ("%s\n", minbuf); ! if (send_rmsg (fd, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); --- 1182,1186 ---- out ("%s\n", minbuf); ! if (send_rmsg (cli, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); *************** *** 1194,1198 **** out ("%s\n", minbuf); ! if (send_rmsg (fd, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); --- 1189,1193 ---- out ("%s\n", minbuf); ! if (send_rmsg (cli, fr->ret, minbuf)!= RET_OK) out ("Failed to send_rmesg\n"); *************** *** 1203,1213 **** sprintf (minbuf, "Unknown message type (%d)", ipcmsg->type); out ("%s\n", minbuf); ! if (send_rmsg (fd, RET_EUNKNOWN, minbuf) != RET_OK) out ("Failed to send_rmesg\n"); ! }// end switch close(cli); ! }//if ( FD_ISSET(fd, &sock_set)) ! }//else } EXIT2: --- 1198,1208 ---- sprintf (minbuf, "Unknown message type (%d)", ipcmsg->type); out ("%s\n", minbuf); ! if (send_rmsg (cli, RET_EUNKNOWN, minbuf) != RET_OK) out ("Failed to send_rmesg\n"); ! } close(cli); ! } ! } } EXIT2: |
