[Netadm-devel] gwc/gwcguid apc.c,1.2,1.3 callback.c,1.2,1.3 interface.c,1.3,1.4 main.c,1.2,1.3
Status: Beta
Brought to you by:
linuxpark
Menu
▾
▴
[Netadm-devel] gwc/gwcguid apc.c,1.2,1.3 callback.c,1.2,1.3 interface.c,1.3,1.4 main.c,1.2,1.3
|
From: 똥꼬 <lin...@us...> - 2006-01-31 16:04:20
|
Update of /cvsroot/netadm/gwc/gwcguid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16114/gwcguid Modified Files: apc.c callback.c interface.c main.c Log Message: ADD: add exception for the signal power setting. from now, signal power will be control only if SNMP set up properly and the target AP is CISCO's Index: apc.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/apc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** apc.c 31 Jan 2006 14:51:58 -0000 1.2 --- apc.c 31 Jan 2006 16:03:44 -0000 1.3 *************** *** 387,391 **** list = sysclist(CMD_LIST_APINFO, NULL, &col, &row); if (row == -1) { - userwin( USERWIN_ERROR, list[0]); return -1; --- 387,390 ---- *************** *** 404,419 **** mask[j++] = list[1][i++]; mask[j++] = 0; - uMask = (char *) malloc(sizeof (char) * j); sprintf(uMask, "%s", mask); - uNoteApData->monApAddress = ip; uNoteApData->monApMask = mask; - dump_Snmp(list, &row, &col); - uNoteApData->monSnmpComunity = list[1]; ! ! sysclistfree(list); return row; } --- 403,413 ---- mask[j++] = list[1][i++]; mask[j++] = 0; uMask = (char *) malloc(sizeof (char) * j); sprintf(uMask, "%s", mask); uNoteApData->monApAddress = ip; uNoteApData->monApMask = mask; dump_Snmp(list, &row, &col); uNoteApData->monSnmpComunity = list[1]; ! /* sysclistfree(list); */ return row; } Index: callback.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/callback.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** callback.c 31 Jan 2006 14:51:58 -0000 1.2 --- callback.c 31 Jan 2006 16:03:44 -0000 1.3 *************** *** 176,180 **** init_noteAp(window); ! init_notePwr(window); if (firstQos) { --- 176,182 ---- init_noteAp(window); ! ! if ( csm->snmp == SNMP_SUPPORT && csm->target == TARGET_CISCO_AP ) ! init_notePwr(window); if (firstQos) { *************** *** 319,322 **** --- 321,329 ---- int result; + if ( csm->snmp == SNMP_NOSUPPORT ) { + userwin ( USERWIN_INFO, "You are needed to setup SNMP"); + return; + } + uSysData = (SysData *) malloc(sizeof (SysData)); *************** *** 372,375 **** --- 379,387 ---- int result; + if ( csm->snmp == SNMP_NOSUPPORT ) { + userwin ( USERWIN_INFO, "You are needed to setup SNMP"); + return; + } + if (uOpenFlag.isOpenIf) return; *************** *** 424,427 **** --- 436,444 ---- int result; + if ( csm->snmp == SNMP_NOSUPPORT ) { + userwin ( USERWIN_INFO, "You are needed to setup SNMP"); + return; + } + if (uOpenFlag.isOpenIp) return; *************** *** 475,478 **** --- 492,500 ---- int result; + if ( csm->snmp == SNMP_NOSUPPORT ) { + userwin ( USERWIN_INFO, "You are needed to setup SNMP"); + return; + } + uTcpData = (TcpData *) malloc(sizeof (TcpData)); *************** *** 528,531 **** --- 550,558 ---- int result; + if ( csm->snmp == SNMP_NOSUPPORT ) { + userwin ( USERWIN_INFO, "You are needed to setup SNMP"); + return; + } + uUdpData = (UdpData *) malloc(sizeof (UdpData)); *************** *** 586,589 **** --- 613,620 ---- GtkWidget *btnCloseWinPwr; + if ( csm->snmp == SNMP_NOSUPPORT ) { + userwin ( USERWIN_INFO, "You are needed to setup SNMP"); + return; + } // call window creater winPwr = create_window7(maxPwrCount); Index: main.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.c 31 Jan 2006 14:19:38 -0000 1.2 --- main.c 31 Jan 2006 16:03:44 -0000 1.3 *************** *** 107,118 **** nPosY = gdk_screen_height() / 10; gtk_window_move(GTK_WINDOW(winMain), nPosX, nPosY); ! #if 0 ! set_pwr_first(winMain); init_Qos(winMain); ! reflesh_pwc(winMain); mainTimer = gtk_timeout_add(1000, (GtkFunction) on_main_timer, (GtkWidget *) winMain); - #endif gtk_widget_show(winMain); --- 107,121 ---- nPosY = gdk_screen_height() / 10; gtk_window_move(GTK_WINDOW(winMain), nPosX, nPosY); ! ! init_Qos(winMain); ! ! if ( csm->snmp == SNMP_SUPPORT && csm->target == TARGET_CISCO_AP ) { ! set_pwr_first(winMain); ! reflesh_pwc(winMain); ! } mainTimer = gtk_timeout_add(1000, (GtkFunction) on_main_timer, (GtkWidget *) winMain); gtk_widget_show(winMain); Index: interface.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** interface.c 31 Jan 2006 14:51:58 -0000 1.3 --- interface.c 31 Jan 2006 16:03:44 -0000 1.4 *************** *** 133,137 **** window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL); ! gtk_widget_set_size_request(window1, 520, 600); gtk_window_set_title(GTK_WINDOW(window1), _("Netadm gwc - GateWay Controler -")); --- 133,137 ---- window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL); ! gtk_widget_set_size_request(window1, 490, 600); gtk_window_set_title(GTK_WINDOW(window1), _("Netadm gwc - GateWay Controler -")); *************** *** 4673,4677 **** gtk_container_add(GTK_CONTAINER(alignment313), vbox311); ! label327 = gtk_label_new(_("ERROR")); gtk_widget_show(label327); gtk_box_pack_start(GTK_BOX(vbox311), label327, FALSE, FALSE, 8); --- 4673,4681 ---- gtk_container_add(GTK_CONTAINER(alignment313), vbox311); ! if ( flag == USERWIN_ERROR ) ! label327 = gtk_label_new(_("Error")); ! else if ( flag == USERWIN_INFO ) ! label327 = gtk_label_new(_("Infomation")); ! gtk_widget_show(label327); gtk_box_pack_start(GTK_BOX(vbox311), label327, FALSE, FALSE, 8); |
