netadm-devel Mailing List for netadm (Page 9)
Status: Beta
Brought to you by:
linuxpark
You can subscribe to this list here.
2006 |
Jan
(4) |
Feb
(78) |
Mar
(70) |
Apr
(32) |
May
(28) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: 똥꼬 <lin...@us...> - 2006-02-06 19:28:37
|
Update of /cvsroot/netadm/gwc/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6431/scripts Modified Files: install.sh Log Message: Add: add error msg during fail stemed from permission. Index: install.sh =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install.sh 5 Feb 2006 14:41:43 -0000 1.5 --- install.sh 6 Feb 2006 19:28:24 -0000 1.6 *************** *** 242,246 **** check_usr(){ if [ "$UID" != "0" ]; then ! local msg=$(xmsg "Installation process requires superuser priviliges abort install ...") $DIALOG --infobox "$msg" 5 75 sleep 2 --- 242,246 ---- check_usr(){ if [ "$UID" != "0" ]; then ! local msg=$(xmsg "error: Installation process requires superuser priviliges abort install ...") $DIALOG --infobox "$msg" 5 75 sleep 2 |
From: 똥꼬 <lin...@us...> - 2006-02-06 19:28:37
|
Update of /cvsroot/netadm/gwc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6431 Modified Files: CHANGES Log Message: Add: add error msg during fail stemed from permission. Index: CHANGES =================================================================== RCS file: /cvsroot/netadm/gwc/CHANGES,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CHANGES 30 Jan 2006 17:41:25 -0000 1.1.1.1 --- CHANGES 6 Feb 2006 19:28:24 -0000 1.2 *************** *** 1,3 **** ! Changes in 0.0.1 ! ---------------- --- 1,9 ---- ! ! Changes in pre-gwc-v0.1 ! ----------------------- ! +add remote monitoring ! +add QoS ! +add flow control ! ! but it has bug in removing each object. |
From: 똥꼬 <lin...@us...> - 2006-02-05 16:03:41
|
Update of /cvsroot/netadm/gwc/gwccli In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31831 Removed Files: .result.swp Log Message: DEL: remove no needed temporary file --- .result.swp DELETED --- |
From: 똥꼬 <lin...@us...> - 2006-02-05 14:41:53
|
Update of /cvsroot/netadm/gwc/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4060/scripts Modified Files: install.sh Log Message: MOD: modify install.sh for user permission error comment Index: install.sh =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install.sh 5 Feb 2006 14:35:34 -0000 1.4 --- install.sh 5 Feb 2006 14:41:43 -0000 1.5 *************** *** 66,70 **** local msg=$(xmsg " %s ! version %s This script is a configurator and installor for %s." ${PROD} ${VERSION} ${PROD}) --- 66,70 ---- local msg=$(xmsg " %s ! version %s This script is a configurator and installor for %s." ${PROD} ${VERSION} ${PROD}) *************** *** 242,247 **** check_usr(){ if [ "$UID" != "0" ]; then ! local msg=$(xmsg "Installation process requires superuser priviliges") ! $DIALOG --infobox "$msg" 20 75 sleep 2 abort_install --- 242,247 ---- check_usr(){ if [ "$UID" != "0" ]; then ! local msg=$(xmsg "Installation process requires superuser priviliges abort install ...") ! $DIALOG --infobox "$msg" 5 75 sleep 2 abort_install |
From: 똥꼬 <lin...@us...> - 2006-02-05 14:35:43
|
Update of /cvsroot/netadm/gwc/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1977 Modified Files: install.sh Log Message: MOD: reversion. Index: install.sh =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** install.sh 31 Jan 2006 16:58:05 -0000 1.3 --- install.sh 5 Feb 2006 14:35:34 -0000 1.4 *************** *** 21,25 **** CONFILE=config PROD="Netadm-gwc" ! VERSION="0.1" INST=/usr/bin/install LOGFILE=install.log --- 21,25 ---- CONFILE=config PROD="Netadm-gwc" ! VERSION="pre-gwc-v0.1" INST=/usr/bin/install LOGFILE=install.log |
From: 똥꼬 <lin...@us...> - 2006-02-05 13:35:12
|
Update of /cvsroot/netadm/gwc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10371 Modified Files: README.en README.ko Log Message: MOD: modify readme Index: README.ko =================================================================== RCS file: /cvsroot/netadm/gwc/README.ko,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README.ko 30 Jan 2006 17:41:25 -0000 1.1.1.1 --- README.ko 5 Feb 2006 13:35:01 -0000 1.2 *************** *** 1,8 **** ! ! gwc AP Á¦¾î¸ðµâ ¼³Ä¡ ¹× À¯ÀÇ »çÇ× ! ============================== ! 2005. 12. 17. (Åä) 02:00:37 KST, ¹Ú Á¦È£, par...@ho... --- 1,7 ---- ! gwc IPv4 router Á¦¾î¸ðµâ ¼³Ä¡ ¹× À¯ÀÇ »çÇ× ! ============================================ ! 2006. 2. 5, ¹Ú Á¦È£, ne...@ke... *************** *** 44,54 **** Do your kernel 2.6.x in directory:[ /usr/src/linux ] (y/n)? y ! make[1]: Entering directory `/root/wrk/wibro-apc/pf' ! make -C /lib/modules/2.6.11/build SUBDIRS=/root/wrk/wibro-apc/pf modules make[2]: Entering directory `/usr/src/linux-2.6.11' Building modules, stage 2. MODPOST make[2]: Leaving directory `/usr/src/linux-2.6.11' ! make[1]: Leaving directory `/root/wrk/wibro-apc/pf' Do you have the 802.1xx supported AP ? (y/n) y --- 43,53 ---- Do your kernel 2.6.x in directory:[ /usr/src/linux ] (y/n)? y ! make[1]: Entering directory `/root/wrk/gwc/pf' ! make -C /lib/modules/2.6.11/build SUBDIRS=/root/wrk/gwc/pf modules make[2]: Entering directory `/usr/src/linux-2.6.11' Building modules, stage 2. MODPOST make[2]: Leaving directory `/usr/src/linux-2.6.11' ! make[1]: Leaving directory `/root/wrk/gwc/pf' Do you have the 802.1xx supported AP ? (y/n) y *************** *** 59,63 **** Do you have a valid SNMP(v1.0) community user account ? (y/n) y ! /* AP Á¦¾î¸ðµâ (wibro-apc) ¿¡¼ ÇÊ¿ä·Î ÇÏ´Â Ä¿³Î ¸ðµâ È®ÀÎ */ /lib/modules/2.6.11/kernel/net/ipv4/netfilter/ip_tables.ko found ... /lib/modules/2.6.11/kernel/net/ipv4/netfilter/iptable_nat.ko found ... --- 58,62 ---- Do you have a valid SNMP(v1.0) community user account ? (y/n) y ! /* AP Á¦¾î¸ðµâ (gwc) ¿¡¼ ÇÊ¿ä·Î ÇÏ´Â Ä¿³Î ¸ðµâ È®ÀÎ */ /lib/modules/2.6.11/kernel/net/ipv4/netfilter/ip_tables.ko found ... /lib/modules/2.6.11/kernel/net/ipv4/netfilter/iptable_nat.ko found ... *************** *** 106,110 **** /usr/local/sbin/gwcadmd { Admin main Daemon } /usr/local/sbin/gwcguid { Guid Daemon } ! /usr/local/sbin/gwccli { Cli command being able to replace of apcguid } /usr/local/gwc/modules/pf.ko { Network kernel module for blocking host or modify TCP header --- 105,109 ---- /usr/local/sbin/gwcadmd { Admin main Daemon } /usr/local/sbin/gwcguid { Guid Daemon } ! /usr/local/sbin/gwccli { Cli command being able to replace of gwcguid } /usr/local/gwc/modules/pf.ko { Network kernel module for blocking host or modify TCP header Index: README.en =================================================================== RCS file: /cvsroot/netadm/gwc/README.en,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README.en 30 Jan 2006 17:41:25 -0000 1.1.1.1 --- README.en 5 Feb 2006 13:35:01 -0000 1.2 *************** *** 1,3 **** ! README for gwc ============================== --- 1,3 ---- ! README for gwc ============================== *************** *** 18,23 **** 1. What is gwc --------------------- ! this program is the controlling system for cisco AP or router. ! functionalities of this gwc is listed below. a. supply realtime network infomation --- 18,23 ---- 1. What is gwc --------------------- ! This program is the controlling system for IPv4 router. ! The functionalities of this gwc is listed below. a. supply realtime network infomation *************** *** 28,32 **** - UDP infomation. ! b. controll wireless signal power for each interface - CCK - OFDM --- 28,32 ---- - UDP infomation. ! b. controll wireless signal power for each interface [ REMOVED ] - CCK - OFDM *************** *** 40,43 **** --- 40,44 ---- e. test simulation of modifying wireless power module as user entered. + [ REMOVED ] - this functionality give automatic power controlling simulation. if you want to know more, please reference howto.pdf. *************** *** 61,65 **** ---------------------------- ! root@apc:~/wrk/gwc# make install Checking user's permission... Linux Verified ! --- 62,66 ---- ---------------------------- ! root@gwc:~/wrk/gwc# make install Checking user's permission... Linux Verified ! *************** *** 128,135 **** Installed program list ---------------------------- ! /usr/local/sbin/apc { Main start|stop script } ! /usr/local/sbin/apcadmd { Admin main Daemon } ! /usr/local/sbin/apcguid { Guid Daemon } ! /usr/local/sbin/apccli { Cli command being able to replace of apcguid } /usr/local/gwc/modules/pf.ko { Network kernel module for blocking host or modify TCP header --- 129,136 ---- Installed program list ---------------------------- ! /usr/local/sbin/gwc { Main start|stop script } ! /usr/local/sbin/gwcadmd { Admin main Daemon } ! /usr/local/sbin/gwcguid { Guid Daemon } ! /usr/local/sbin/gwccli { Cli command being able to replace of gwcguid } /usr/local/gwc/modules/pf.ko { Network kernel module for blocking host or modify TCP header *************** *** 143,153 **** -------- 6-1. start gwc ! #apc start 6-2. stop gwc ! #apc stop 6-3. why the AP must be cisco's ? ! because this gwc program use cisco enterprise defined mip and above all, the admin daemon called 'apcadmd' query your cisco AP from start time and this daemon get some specific AP infomations so if your AP is not CISCO we can't not sure perfect operation of this gwc. 6-4. if you find this window message "Can't query to AP ... ?" --- 144,154 ---- -------- 6-1. start gwc ! #gwc start 6-2. stop gwc ! #gwc stop 6-3. why the AP must be cisco's ? ! because this gwc program use cisco enterprise defined mip and above all, the admin daemon called 'gwcadmd' query your cisco AP from start time and this daemon get some specific AP infomations so if your AP is not CISCO we can't not sure perfect operation of this gwc. 6-4. if you find this window message "Can't query to AP ... ?" |
From: 똥꼬 <lin...@us...> - 2006-02-05 13:18:40
|
Update of /cvsroot/netadm/gwc/gwcguid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4324/gwcguid Modified Files: callback.c interface.c Log Message: DEL: 1. delete wireless AP query Index: callback.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/callback.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** callback.c 31 Jan 2006 16:03:44 -0000 1.3 --- callback.c 5 Feb 2006 13:18:31 -0000 1.4 *************** *** 184,191 **** firstQos = 0; } - - if (isOnStatusBar-- == 0) - set_item_statusbar(" "); - mainTimer = gtk_timeout_add(1000, (GtkFunction) on_main_timer, --- 184,187 ---- *************** *** 204,207 **** --- 200,204 ---- lookup_widget(GTK_WIDGET(widget), "entryMonSnmp"))); + //newSnmp = (char *) gtk_entry_get_text ((GtkEntry *)lookup_widget(GTK_WIDGET(widget),"entryMonSnmp")); gtk_entry_set_text((GtkEntry *) Index: interface.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** interface.c 31 Jan 2006 16:03:44 -0000 1.4 --- interface.c 5 Feb 2006 13:18:31 -0000 1.5 *************** *** 97,134 **** GtkWidget *label22; GtkWidget *label1; - GtkWidget *vbox4; - GtkWidget *alignment8; - GtkWidget *frame2; - GtkWidget *alignment7; - GtkWidget *hbox8; - GtkWidget *vbox5; - GtkWidget *hbox9; - GtkWidget *label32; - GtkWidget *entryPwrCck; - GtkWidget *label35; - GtkWidget *hbox10; - GtkWidget *label33; - GtkWidget *entryPwrOfdm; - GtkWidget *label36; - GtkWidget *hbox11; - GtkWidget *label34; - GtkWidget *entryPwrClient; - GtkWidget *label37; - GtkWidget *label24; - GtkWidget *hbox7; - GtkWidget *label25; - GtkWidget *btnPwrSet; - GtkWidget *label26; - GtkWidget *label2; - GtkWidget *alignment1; - GtkWidget *hbox1; - GtkWidget *label3; - GtkWidget *btnExit; - GtkWidget *label23; - // new!! - GtkWidget *alignmentMonPwr; - GtkWidget *hboxMonPwr; - GtkWidget *labelMonPwr; - GtkWidget *comboboxMonPwr; window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL); --- 97,100 ---- *************** *** 147,151 **** notebook1 = gtk_notebook_new(); gtk_widget_show(notebook1); ! gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 5); alignment3 = gtk_alignment_new(0.5, 0.5, 1, 1); --- 113,117 ---- notebook1 = gtk_notebook_new(); gtk_widget_show(notebook1); ! gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 3); alignment3 = gtk_alignment_new(0.5, 0.5, 1, 1); *************** *** 345,520 **** gtk_box_pack_start(GTK_BOX(vbox2), labelTrivial2, TRUE, TRUE, 0); ! label1 = gtk_label_new(_(" Monitor ")); gtk_widget_show(label1); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 0), ! label1); ! ! //here~ ! vbox4 = gtk_vbox_new(FALSE, 0); ! gtk_widget_show(vbox4); ! gtk_container_add(GTK_CONTAINER(notebook1), vbox4); ! ! // new label and combobox ! alignmentMonPwr = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignmentMonPwr); ! gtk_box_pack_start(GTK_BOX(vbox4), alignmentMonPwr, TRUE, FALSE, 0); ! gtk_alignment_set_padding(GTK_ALIGNMENT(alignmentMonPwr), 5, 5, 15, 5); ! ! hboxMonPwr = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hboxMonPwr); ! gtk_container_add(GTK_CONTAINER(alignmentMonPwr), hboxMonPwr); ! ! labelMonPwr = gtk_label_new(_("Interface ")); ! gtk_widget_show(labelMonPwr); ! gtk_box_pack_start(GTK_BOX(hboxMonPwr), labelMonPwr, FALSE, FALSE, 0); ! ! comboboxMonPwr = gtk_combo_box_new_text(); ! gtk_widget_show(comboboxMonPwr); ! gtk_box_pack_start(GTK_BOX(hboxMonPwr), comboboxMonPwr, FALSE, FALSE, ! 0); ! gtk_widget_set_size_request(comboboxMonPwr, 183, 30); ! ! // end new widget ! ! alignment8 = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignment8); ! gtk_box_pack_start(GTK_BOX(vbox4), alignment8, TRUE, TRUE, 0); ! ! frame2 = gtk_frame_new(NULL); ! gtk_widget_show(frame2); ! gtk_container_add(GTK_CONTAINER(alignment8), frame2); ! gtk_container_set_border_width(GTK_CONTAINER(frame2), 6); ! ! alignment7 = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignment7); ! gtk_container_add(GTK_CONTAINER(frame2), alignment7); ! gtk_alignment_set_padding(GTK_ALIGNMENT(alignment7), 0, 0, 12, 0); ! ! hbox8 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox8); ! gtk_container_add(GTK_CONTAINER(alignment7), hbox8); ! ! vbox5 = gtk_vbox_new(FALSE, 0); ! gtk_widget_show(vbox5); ! gtk_box_pack_start(GTK_BOX(hbox8), vbox5, TRUE, TRUE, 0); ! ! hbox9 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox9); ! gtk_box_pack_start(GTK_BOX(vbox5), hbox9, TRUE, TRUE, 0); ! ! label32 = gtk_label_new(_("CCK transmitter power ")); ! gtk_widget_show(label32); // ! gtk_box_pack_start(GTK_BOX(hbox9), label32, FALSE, FALSE, 0); ! ! entryPwrCck = gtk_entry_new(); ! gtk_widget_show(entryPwrCck); ! gtk_box_pack_start(GTK_BOX(hbox9), entryPwrCck, TRUE, TRUE, 0); ! gtk_widget_set_size_request(entryPwrCck, 158, 25); ! ! label35 = gtk_label_new(_(" ")); ! gtk_widget_show(label35); ! gtk_box_pack_start(GTK_BOX(hbox9), label35, FALSE, FALSE, 0); ! ! hbox10 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox10); ! gtk_box_pack_start(GTK_BOX(vbox5), hbox10, TRUE, TRUE, 0); ! ! label33 = gtk_label_new(_("OFDM transmitter power ")); ! gtk_widget_show(label33); ! gtk_box_pack_start(GTK_BOX(hbox10), label33, FALSE, FALSE, 0); ! ! entryPwrOfdm = gtk_entry_new(); ! gtk_widget_show(entryPwrOfdm); ! gtk_box_pack_start(GTK_BOX(hbox10), entryPwrOfdm, TRUE, TRUE, 0); ! gtk_widget_set_size_request(entryPwrOfdm, 158, 25); ! ! label36 = gtk_label_new(_(" ")); ! gtk_widget_show(label36); ! gtk_box_pack_start(GTK_BOX(hbox10), label36, FALSE, FALSE, 0); ! ! hbox11 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox11); // ! gtk_box_pack_start(GTK_BOX(vbox5), hbox11, TRUE, TRUE, 0); ! ! label34 = gtk_label_new(_("Client transmitter power ")); ! gtk_widget_show(label34); ! gtk_box_pack_start(GTK_BOX(hbox11), label34, FALSE, FALSE, 0); ! ! entryPwrClient = gtk_entry_new(); ! gtk_widget_show(entryPwrClient); ! gtk_box_pack_start(GTK_BOX(hbox11), entryPwrClient, TRUE, TRUE, 0); ! gtk_widget_set_size_request(entryPwrClient, 158, 25); ! ! label37 = gtk_label_new(_(" ")); ! gtk_widget_show(label37); ! gtk_box_pack_start(GTK_BOX(hbox11), label37, FALSE, FALSE, 0); ! ! label24 = gtk_label_new(_("<b>Power Modulation Element</b>")); ! gtk_widget_show(label24); ! gtk_frame_set_label_widget(GTK_FRAME(frame2), label24); ! gtk_label_set_use_markup(GTK_LABEL(label24), TRUE); ! gtk_misc_set_padding(GTK_MISC(label24), 5, 0); ! ! hbox7 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox7); ! gtk_box_pack_start(GTK_BOX(vbox4), hbox7, TRUE, FALSE, 0); ! ! label25 = gtk_label_new(_(" ")); ! gtk_widget_show(label25); ! gtk_box_pack_start(GTK_BOX(hbox7), label25, FALSE, FALSE, 0); // ! ! btnPwrSet = gtk_button_new_with_mnemonic(_("set")); ! gtk_widget_show(btnPwrSet); ! gtk_box_pack_start(GTK_BOX(hbox7), btnPwrSet, FALSE, FALSE, 0); ! gtk_widget_set_size_request(btnPwrSet, 62, 31); ! ! label26 = gtk_label_new(_(" ")); ! gtk_widget_show(label26); ! gtk_box_pack_start(GTK_BOX(hbox7), label26, FALSE, FALSE, 0); ! ! label2 = gtk_label_new(_(" Power ")); ! gtk_widget_show(label2); ! gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), ! gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 1), ! label2); ! ! alignment1 = gtk_alignment_new(0.5, 0.5, 1, 1); ! gtk_widget_show(alignment1); ! gtk_box_pack_start(GTK_BOX(vbox1), alignment1, TRUE, FALSE, 1); ! gtk_alignment_set_padding(GTK_ALIGNMENT(alignment1), 0, 0, 3, 3); ! ! hbox1 = gtk_hbox_new(FALSE, 0); ! gtk_widget_show(hbox1); // ! gtk_container_add(GTK_CONTAINER(alignment1), hbox1); ! ! label3 = ! gtk_label_new(_ ! (" ")); ! gtk_widget_show(label3); ! gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); ! ! btnExit = gtk_button_new_with_mnemonic(_("exit")); ! gtk_widget_show(btnExit); ! gtk_box_pack_start(GTK_BOX(hbox1), btnExit, FALSE, FALSE, 0); ! gtk_widget_set_size_request(btnExit, 55, 25); ! ! label23 = gtk_label_new(_(" ")); ! gtk_widget_show(label23); ! gtk_box_pack_start(GTK_BOX(hbox1), label23, FALSE, FALSE, 0); ! ! statusbar1 = gtk_statusbar_new(); ! gtk_widget_show(statusbar1); ! gtk_box_pack_start(GTK_BOX(vbox1), statusbar1, FALSE, FALSE, 4); ! ! ////////////////////////////////////////////////////////////////////////////////////////////// ! ////////////////////////////////////////////////////////////////////////////////////////////// ! // ERROR PACKET ////////////////////////////////////////////////////////////////////////////// ! ////////////////////////////////////////////////////////////////////////////////////////////// ! ////////////////////////////////////////////////////////////////////////////////////////////// ! ! //################################################################### 1i g_signal_connect(G_OBJECT(window1), "destroy", G_CALLBACK(close_event), NULL); --- 311,319 ---- gtk_box_pack_start(GTK_BOX(vbox2), labelTrivial2, TRUE, TRUE, 0); ! label1 = gtk_label_new(_(" Monitoring ")); gtk_widget_show(label1); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 0),label1); g_signal_connect(G_OBJECT(window1), "destroy", G_CALLBACK(close_event), NULL); *************** *** 531,547 **** g_signal_connect(G_OBJECT(btnMonUdpInfo), "clicked", G_CALLBACK(open_winUdp), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(btnPwrSet), "clicked", - G_CALLBACK(open_winPwr), (GtkWidget *) window1); g_signal_connect(G_OBJECT(btnMonApSet), "clicked", G_CALLBACK(open_winAp), (GtkWidget *) window1); g_signal_connect(G_OBJECT(btnMonSnmpSet), "clicked", G_CALLBACK(reset_monSnmp), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(btnExit), "clicked", G_CALLBACK(close_event), - NULL); g_signal_connect(G_OBJECT(entryMonSnmp), "backspace", G_CALLBACK(on_append_snmp), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(comboboxMonPwr), "changed", - G_CALLBACK(on_pwr_changed), (GtkWidget *) window1); - /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF(window1, window1, "window1"); --- 330,339 ---- *************** *** 592,631 **** GLADE_HOOKUP_OBJECT(window1, label22, "label22"); GLADE_HOOKUP_OBJECT(window1, label1, "label1"); - GLADE_HOOKUP_OBJECT(window1, vbox4, "vbox4"); - GLADE_HOOKUP_OBJECT(window1, alignment8, "alignment8"); - GLADE_HOOKUP_OBJECT(window1, frame2, "frame2"); - GLADE_HOOKUP_OBJECT(window1, alignment7, "alignment7"); - GLADE_HOOKUP_OBJECT(window1, hbox8, "hbox8"); - GLADE_HOOKUP_OBJECT(window1, vbox5, "vbox5"); - GLADE_HOOKUP_OBJECT(window1, hbox9, "hbox9"); - GLADE_HOOKUP_OBJECT(window1, label32, "label32"); - GLADE_HOOKUP_OBJECT(window1, entryPwrCck, "entryPwrCck"); - GLADE_HOOKUP_OBJECT(window1, label35, "label35"); - GLADE_HOOKUP_OBJECT(window1, hbox10, "hbox10"); - GLADE_HOOKUP_OBJECT(window1, label33, "label33"); - GLADE_HOOKUP_OBJECT(window1, entryPwrOfdm, "entryPwrOfdm"); - GLADE_HOOKUP_OBJECT(window1, label36, "label36"); - GLADE_HOOKUP_OBJECT(window1, hbox11, "hbox11"); - GLADE_HOOKUP_OBJECT(window1, label34, "label34"); - GLADE_HOOKUP_OBJECT(window1, entryPwrClient, "entryPwrClient"); - GLADE_HOOKUP_OBJECT(window1, label37, "label37"); - GLADE_HOOKUP_OBJECT(window1, label24, "label24"); - GLADE_HOOKUP_OBJECT(window1, hbox7, "hbox7"); - GLADE_HOOKUP_OBJECT(window1, label25, "label25"); - GLADE_HOOKUP_OBJECT(window1, btnPwrSet, "btnPwrSet"); - GLADE_HOOKUP_OBJECT(window1, label26, "label26"); - GLADE_HOOKUP_OBJECT(window1, label2, "label2"); - GLADE_HOOKUP_OBJECT(window1, alignment1, "alignment1"); - GLADE_HOOKUP_OBJECT(window1, hbox1, "hbox1"); - GLADE_HOOKUP_OBJECT(window1, label3, "label3"); - GLADE_HOOKUP_OBJECT(window1, btnExit, "btnExit"); - GLADE_HOOKUP_OBJECT(window1, label23, "label23"); - // new - GLADE_HOOKUP_OBJECT(window1, alignmentMonPwr, "alignmentMonPwr"); - GLADE_HOOKUP_OBJECT(window1, hboxMonPwr, "hboxMonPwr"); - GLADE_HOOKUP_OBJECT(window1, labelMonPwr, "labelMonPwr"); - GLADE_HOOKUP_OBJECT(window1, comboboxMonPwr, "comboboxMonPwr"); - - //////////////////////////////////////////////////////////////////////////////// GtkWidget *alignment301; --- 384,387 ---- *************** *** 690,697 **** label302 = gtk_label_new(_("QoS and BandWidth")); ! //gtk_widget_show (label302); ! //gtk_box_pack_start (GTK_BOX (vbox301), label302, FALSE, FALSE, 2); - //start//////////////////////////////////////////////////////////////// frame301 = gtk_frame_new(NULL); gtk_widget_show(frame301); --- 446,452 ---- label302 = gtk_label_new(_("QoS and BandWidth")); ! gtk_widget_show (label302); ! gtk_box_pack_start (GTK_BOX (vbox301), label302, FALSE, FALSE, 1); frame301 = gtk_frame_new(NULL); gtk_widget_show(frame301); *************** *** 718,727 **** label317 = gtk_label_new(_(" Class Name ")); ! //gtk_widget_show (label317); gtk_box_pack_start(GTK_BOX(hbox307), label317, FALSE, FALSE, 0); gtk_widget_set_size_request(label317, 185, -1); label318 = gtk_label_new(_("Bandwidth(%)")); ! //gtk_widget_show (label318); gtk_box_pack_start(GTK_BOX(hbox307), label318, FALSE, FALSE, 0); gtk_widget_set_size_request(label318, 118, -1); --- 473,482 ---- label317 = gtk_label_new(_(" Class Name ")); ! gtk_widget_show (label317); gtk_box_pack_start(GTK_BOX(hbox307), label317, FALSE, FALSE, 0); gtk_widget_set_size_request(label317, 185, -1); label318 = gtk_label_new(_("Bandwidth(%)")); ! gtk_widget_show (label318); gtk_box_pack_start(GTK_BOX(hbox307), label318, FALSE, FALSE, 0); gtk_widget_set_size_request(label318, 118, -1); *************** *** 735,739 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - /// cpoint GtkWidget *clist105; char *titles201[2] = { "Interface Name", "Max Bandwidth(KByte/sec)" }; --- 490,493 ---- *************** *** 767,772 **** gtk_label_set_use_markup(GTK_LABEL(label10), TRUE); gtk_misc_set_padding(GTK_MISC(label10), 5, 0); - // new frame - ////////////////////////////////////////////////////////////////// frame301 = gtk_frame_new(NULL); --- 521,524 ---- *************** *** 793,803 **** label317 = ! gtk_label_new(_(" Class Name ")); ! //gtk_widget_show (label317); gtk_box_pack_start(GTK_BOX(hbox307), label317, FALSE, FALSE, 0); gtk_widget_set_size_request(label317, 185, -1); label318 = gtk_label_new(_("Bandwidth(%)")); ! //gtk_widget_show (label318); gtk_box_pack_start(GTK_BOX(hbox307), label318, FALSE, FALSE, 0); gtk_widget_set_size_request(label318, 118, -1); --- 545,555 ---- label317 = ! gtk_label_new(_(" Class Name ")); ! gtk_widget_show (label317); gtk_box_pack_start(GTK_BOX(hbox307), label317, FALSE, FALSE, 0); gtk_widget_set_size_request(label317, 185, -1); label318 = gtk_label_new(_("Bandwidth(%)")); ! gtk_widget_show (label318); gtk_box_pack_start(GTK_BOX(hbox307), label318, FALSE, FALSE, 0); gtk_widget_set_size_request(label318, 118, -1); *************** *** 811,815 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - /// cpoint GtkWidget *clist101; char *titles101[3] = --- 563,566 ---- *************** *** 844,848 **** gtk_label_set_use_markup(GTK_LABEL(label10), TRUE); gtk_misc_set_padding(GTK_MISC(label10), 5, 0); - // new frame frame302 = gtk_frame_new(NULL); --- 595,598 ---- *************** *** 870,889 **** label319 = gtk_label_new(_(" Filter Name ")); ! //gtk_widget_show (label319); gtk_box_pack_start(GTK_BOX(hbox309), label319, FALSE, FALSE, 0); gtk_widget_set_size_request(label319, 100, -1); label320 = gtk_label_new(_(" Type ")); ! //gtk_widget_show (label320); gtk_box_pack_start(GTK_BOX(hbox309), label320, FALSE, FALSE, 0); gtk_widget_set_size_request(label320, 60, -1); label321 = gtk_label_new(_(" Detail ")); ! //gtk_widget_show (label321); gtk_box_pack_start(GTK_BOX(hbox309), label321, FALSE, FALSE, 0); gtk_widget_set_size_request(label321, 60, -1); label392 = gtk_label_new(_(" Port")); ! //gtk_widget_show (label392); gtk_box_pack_start(GTK_BOX(hbox309), label392, FALSE, FALSE, 0); gtk_widget_set_size_request(label392, 70, -1); --- 620,639 ---- label319 = gtk_label_new(_(" Filter Name ")); ! gtk_widget_show (label319); gtk_box_pack_start(GTK_BOX(hbox309), label319, FALSE, FALSE, 0); gtk_widget_set_size_request(label319, 100, -1); label320 = gtk_label_new(_(" Type ")); ! gtk_widget_show (label320); gtk_box_pack_start(GTK_BOX(hbox309), label320, FALSE, FALSE, 0); gtk_widget_set_size_request(label320, 60, -1); label321 = gtk_label_new(_(" Detail ")); ! gtk_widget_show (label321); gtk_box_pack_start(GTK_BOX(hbox309), label321, FALSE, FALSE, 0); gtk_widget_set_size_request(label321, 60, -1); label392 = gtk_label_new(_(" Port")); ! gtk_widget_show (label392); gtk_box_pack_start(GTK_BOX(hbox309), label392, FALSE, FALSE, 0); gtk_widget_set_size_request(label392, 70, -1); *************** *** 897,901 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - // cpoint GtkWidget *clist102; char *titles102[4] = --- 647,650 ---- *************** *** 967,971 **** GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - // cpoint GtkWidget *clist103; char *titles103[5] = { "rule ", --- 716,719 ---- *************** *** 1006,1010 **** gtk_misc_set_padding(GTK_MISC(label305), 5, 0); - ////// alignment312 = gtk_alignment_new(0.5, 0.5, 1, 1); gtk_widget_show(alignment312); --- 754,757 ---- *************** *** 1024,1031 **** gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 2), ! label301); - ///////////////////////////////////////////////////////////////////////// g_signal_connect(G_OBJECT(btnQosBandAdd), "clicked", G_CALLBACK(open_winBand), (GtkWidget *) window1); --- 771,776 ---- gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 1), label301); g_signal_connect(G_OBJECT(btnQosBandAdd), "clicked", G_CALLBACK(open_winBand), (GtkWidget *) window1); *************** *** 1110,1116 **** GLADE_HOOKUP_OBJECT(window1, label301, "label301"); ! //////////////////////////////////////////////////////////////////////////////// ! //// ERROR PACKET ////////////////////////////////////////////////////////////// ! //////////////////////////////////////////////////////////////////////////////// GtkWidget *alignment701; GtkWidget *vbox701; --- 855,861 ---- GLADE_HOOKUP_OBJECT(window1, label301, "label301"); ! /* ! * flow control ! */ GtkWidget *alignment701; GtkWidget *vbox701; *************** *** 1193,1204 **** gtk_widget_set_size_request(buttonErrorApply, 70, -1); ! label701 = gtk_label_new(_(" Packet Control ")); gtk_widget_show(label701); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 3), ! label701); - //////////////////////////////////////////////////////////////////////////////////////////////////////////// g_signal_connect(G_OBJECT(buttonErrorAdd), "clicked", G_CALLBACK(on_errpkt_add), (GtkWidget *) window1); --- 938,947 ---- gtk_widget_set_size_request(buttonErrorApply, 70, -1); ! label701 = gtk_label_new(_(" Flow Control ")); gtk_widget_show(label701); gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), gtk_notebook_get_nth_page(GTK_NOTEBOOK ! (notebook1), 2),label701); g_signal_connect(G_OBJECT(buttonErrorAdd), "clicked", G_CALLBACK(on_errpkt_add), (GtkWidget *) window1); *************** *** 1224,1514 **** update_errpkt((GtkWidget *) window1); - /********************************************************************/ - /* */ - /* A U T O S I G N A L R E C Y C L E */ - /* */ - /********************************************************************/ - GtkWidget *pwc_vbox_main; - GtkWidget *pwc_align1; - GtkWidget *pwc_hbox5; - GtkWidget *pwc_label8; - GtkWidget *pwc_btn_set; - GtkWidget *pwc_btn_apply; - GtkWidget *pwc_label9; - GtkWidget *pwc_label10; - - pwc_vbox_main = gtk_vbox_new(FALSE, 0); - gtk_widget_show(pwc_vbox_main); - gtk_container_add(GTK_CONTAINER(notebook1), pwc_vbox_main); - - pwc_align1 = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align1); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_align1, TRUE, TRUE, 0); - /* stop interval ************************************************ */ - /*****************************************************************/ - GtkWidget *pwc_frame_stop; - GtkWidget *pwc_align2_stop; - GtkWidget *pwc_hbox1_stop; - GtkWidget *pwc_vbox1_stop; - GtkWidget *pwc_hbox2_stop; - GtkWidget *pwc_label1_stop; - GtkWidget *pwc_entry_stop1; - GtkWidget *pwc_label3_stop; - GtkWidget *pwc_entry_stop2; - GtkWidget *pwc_label7_stop; - - pwc_frame_stop = gtk_frame_new(NULL); - gtk_widget_show(pwc_frame_stop); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_frame_stop, TRUE, TRUE, - 0); - gtk_container_set_border_width(GTK_CONTAINER(pwc_frame_stop), 3); - - pwc_align2_stop = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align2_stop); - gtk_container_add(GTK_CONTAINER(pwc_frame_stop), pwc_align2_stop); - gtk_alignment_set_padding(GTK_ALIGNMENT(pwc_align2_stop), 0, 0, 12, 0); - - /* BASE VBOX */ - pwc_vbox1_stop = gtk_vbox_new(FALSE, 10); - gtk_widget_show(pwc_vbox1_stop); - gtk_container_add(GTK_CONTAINER(pwc_align2_stop), pwc_vbox1_stop); - - /* SUB HBOX */ - pwc_hbox1_stop = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox1_stop); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_stop), pwc_hbox1_stop, FALSE, - FALSE, 5); - - /* SUB HBOX */ - pwc_hbox2_stop = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox2_stop); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_stop), pwc_hbox2_stop, FALSE, - FALSE, 5); - - /* each mem in hboxs which in base vbox */ - pwc_label1_stop = gtk_label_new(_("First stop interval")); - gtk_widget_show(pwc_label1_stop); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_stop), pwc_label1_stop, TRUE, - FALSE, 5); - - pwc_entry_stop1 = gtk_entry_new(); - gtk_widget_show(pwc_entry_stop1); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_stop), pwc_entry_stop1, TRUE, - FALSE, 5); - - pwc_label3_stop = gtk_label_new(_("Second stop interval")); - gtk_widget_show(pwc_label3_stop); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_stop), pwc_label3_stop, TRUE, - FALSE, 5); - - pwc_entry_stop2 = gtk_entry_new(); - gtk_widget_show(pwc_entry_stop2); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_stop), pwc_entry_stop2, TRUE, - FALSE, 5); - - pwc_label7_stop = gtk_label_new(_("<b>Stop interval</b>")); - gtk_widget_show(pwc_label7_stop); - gtk_frame_set_label_widget(GTK_FRAME(pwc_frame_stop), pwc_label7_stop); - gtk_label_set_use_markup(GTK_LABEL(pwc_label7_stop), TRUE); - gtk_misc_set_padding(GTK_MISC(pwc_label7_stop), 5, 0); - /*****************************************************************/ - - /* moving interval ************************************************ */ - /*****************************************************************/ - GtkWidget *pwc_frame_mov; - GtkWidget *pwc_align2_mov; - GtkWidget *pwc_hbox1_mov; - GtkWidget *pwc_vbox1_mov; - GtkWidget *pwc_hbox2_mov; - GtkWidget *pwc_label1_mov; - GtkWidget *pwc_entry_m1; - GtkWidget *pwc_label3_mov; - GtkWidget *pwc_entry_m2; - GtkWidget *pwc_label7_mov; - - pwc_frame_mov = gtk_frame_new(NULL); - gtk_widget_show(pwc_frame_mov); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_frame_mov, TRUE, TRUE, - 0); - gtk_container_set_border_width(GTK_CONTAINER(pwc_frame_mov), 3); - - pwc_align2_mov = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align2_mov); - gtk_container_add(GTK_CONTAINER(pwc_frame_mov), pwc_align2_mov); - gtk_alignment_set_padding(GTK_ALIGNMENT(pwc_align2_mov), 0, 0, 12, 0); - - /* BASE VBOX */ - pwc_vbox1_mov = gtk_vbox_new(FALSE, 10); - gtk_widget_show(pwc_vbox1_mov); - gtk_container_add(GTK_CONTAINER(pwc_align2_mov), pwc_vbox1_mov); - - /* SUB HBOX */ - pwc_hbox1_mov = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox1_mov); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_mov), pwc_hbox1_mov, FALSE, FALSE, - 5); - - /* SUB HBOX */ - pwc_hbox2_mov = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox2_mov); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_mov), pwc_hbox2_mov, FALSE, FALSE, - 5); - - /* each mem in hboxs which in base vbox */ - pwc_label1_mov = gtk_label_new(_("First moving interval")); - gtk_widget_show(pwc_label1_mov); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_mov), pwc_label1_mov, TRUE, FALSE, - 5); - - pwc_entry_m1 = gtk_entry_new(); - gtk_widget_show(pwc_entry_m1); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_mov), pwc_entry_m1, TRUE, FALSE, - 5); - - pwc_label3_mov = gtk_label_new(_("Second moving interval")); - gtk_widget_show(pwc_label3_mov); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_mov), pwc_label3_mov, TRUE, FALSE, - 5); - - pwc_entry_m2 = gtk_entry_new(); - gtk_widget_show(pwc_entry_m2); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_mov), pwc_entry_m2, TRUE, FALSE, - 5); - - pwc_label7_mov = gtk_label_new(_("<b>Moving interval</b>")); - gtk_widget_show(pwc_label7_mov); - gtk_frame_set_label_widget(GTK_FRAME(pwc_frame_mov), pwc_label7_mov); - gtk_label_set_use_markup(GTK_LABEL(pwc_label7_mov), TRUE); - gtk_misc_set_padding(GTK_MISC(pwc_label7_mov), 5, 0); - /*****************************************************************/ - - /* test config ************************************************* */ - /*****************************************************************/ - GtkWidget *pwc_frame_conf; - GtkWidget *pwc_align2_conf; - GtkWidget *pwc_hbox1_conf; - GtkWidget *pwc_vbox1_conf; - GtkWidget *pwc_hbox2_conf; - GtkWidget *pwc_label1_conf; - GtkWidget *pwc_label3_conf; - GtkWidget *pwc_com_init; - GtkWidget *pwc_entry_cnum; - GtkWidget *pwc_label7_conf; - GtkWidget *pwc_table_conf; - - pwc_frame_conf = gtk_frame_new(NULL); - gtk_widget_show(pwc_frame_conf); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_frame_conf, TRUE, TRUE, - 0); - gtk_container_set_border_width(GTK_CONTAINER(pwc_frame_conf), 3); - - pwc_align2_conf = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(pwc_align2_conf); - gtk_container_add(GTK_CONTAINER(pwc_frame_conf), pwc_align2_conf); - gtk_alignment_set_padding(GTK_ALIGNMENT(pwc_align2_conf), 0, 0, 12, 0); - - /* BASE VBOX */ - pwc_vbox1_conf = gtk_vbox_new(FALSE, 13); - gtk_widget_show(pwc_vbox1_conf); - gtk_container_add(GTK_CONTAINER(pwc_align2_conf), pwc_vbox1_conf); - - /* SUB HBOX */ - pwc_hbox1_conf = gtk_hbox_new(TRUE, 8); - gtk_widget_show(pwc_hbox1_conf); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_conf), pwc_hbox1_conf, FALSE, - FALSE, 5); - - /* SUB HBOX */ - pwc_hbox2_conf = gtk_hbox_new(TRUE, 5); - gtk_widget_show(pwc_hbox2_conf); - gtk_box_pack_start(GTK_BOX(pwc_vbox1_conf), pwc_hbox2_conf, FALSE, - FALSE, 5); - - /* each mem in hboxs which in base vbox */ - pwc_label1_conf = gtk_label_new(_("Initial value")); - gtk_widget_show(pwc_label1_conf); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_conf), pwc_label1_conf, TRUE, - FALSE, 5); - - pwc_table_conf = gtk_table_new(3, 2, FALSE); - gtk_widget_show(pwc_table_conf); - gtk_box_pack_start(GTK_BOX(pwc_hbox1_conf), pwc_table_conf, TRUE, FALSE, - 5); - gtk_table_set_row_spacings(GTK_TABLE(pwc_table_conf), 3); - - pwc_com_init = gtk_combo_box_new_text(); - gtk_widget_show(pwc_com_init); - gtk_table_attach(GTK_TABLE(pwc_table_conf), pwc_com_init, 1, 2, 0, 1, - (GtkAttachOptions) (0), - (GtkAttachOptions) (GTK_FILL), 0, 0); - - gtk_combo_box_append_text(GTK_COMBO_BOX(pwc_com_init), - "Minimum Power Ratio"); - gtk_combo_box_append_text(GTK_COMBO_BOX(pwc_com_init), - "Maximum Power Ratio"); - gtk_combo_box_set_active(GTK_COMBO_BOX(pwc_com_init), 0); - - pwc_label3_conf = gtk_label_new(_("Number of test to recycle")); - gtk_widget_show(pwc_label3_conf); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_conf), pwc_label3_conf, TRUE, - FALSE, 5); - - pwc_entry_cnum = gtk_entry_new(); - gtk_widget_show(pwc_entry_cnum); - gtk_box_pack_start(GTK_BOX(pwc_hbox2_conf), pwc_entry_cnum, TRUE, FALSE, - 5); - - /* Test Config */ - pwc_label7_conf = gtk_label_new(_("<b>Test Configuration</b>")); - gtk_widget_show(pwc_label7_conf); - gtk_frame_set_label_widget(GTK_FRAME(pwc_frame_conf), pwc_label7_conf); - gtk_label_set_use_markup(GTK_LABEL(pwc_label7_conf), TRUE); - gtk_misc_set_padding(GTK_MISC(pwc_label7_conf), 5, 0); - /*****************************************************************/ - - pwc_hbox5 = gtk_hbox_new(FALSE, 0); - gtk_widget_show(pwc_hbox5); - gtk_box_pack_start(GTK_BOX(pwc_vbox_main), pwc_hbox5, TRUE, FALSE, 0); - - pwc_label8 = gtk_label_new(_(" ")); - gtk_widget_show(pwc_label8); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_label8, FALSE, FALSE, 0); - - /* S E T button */ - pwc_btn_set = gtk_button_new_with_mnemonic(_("set")); - gtk_widget_show(pwc_btn_set); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_btn_set, FALSE, FALSE, 0); - gtk_widget_set_size_request(pwc_btn_set, 62, 31); - - pwc_label9 = gtk_label_new(_(" ")); - gtk_widget_show(pwc_label9); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_label9, FALSE, FALSE, 0); - - /* A P P L Y button */ - pwc_btn_apply = gtk_button_new_with_mnemonic(_("apply")); - gtk_widget_show(pwc_btn_apply); - gtk_box_pack_start(GTK_BOX(pwc_hbox5), pwc_btn_apply, FALSE, FALSE, 0); - gtk_widget_set_size_request(pwc_btn_apply, 62, 31); - - pwc_label10 = gtk_label_new(_(" Wirelss Power Test ")); - gtk_widget_show(pwc_label10); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), - gtk_notebook_get_nth_page(GTK_NOTEBOOK - (notebook1), 4), - pwc_label10); - - /* A U T O S I G N A L R E C Y C L E end */ - g_signal_connect(G_OBJECT(pwc_btn_set), "clicked", - G_CALLBACK(cbset_pwc), (GtkWidget *) window1); - g_signal_connect(G_OBJECT(pwc_btn_apply), "clicked", - G_CALLBACK(cbapply_pwc), (GtkWidget *) window1); - GLADE_HOOKUP_OBJECT_NO_REF(window1, window1, "window1"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_stop1, "pwc_entry_stop1"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_stop2, "pwc_entry_stop2"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_m1, "pwc_entry_m1"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_m2, "pwc_entry_m2"); - GLADE_HOOKUP_OBJECT(window1, pwc_com_init, "pwc_com_init"); - GLADE_HOOKUP_OBJECT(window1, pwc_entry_cnum, "pwc_entry_cnum"); - return window1; } --- 967,970 ---- |
From: 똥꼬 <lin...@us...> - 2006-02-05 13:18:40
|
Update of /cvsroot/netadm/gwc/gwcadmd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4324/gwcadmd Modified Files: main.c Log Message: DEL: 1. delete wireless AP query Index: main.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcadmd/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 31 Jan 2006 16:03:44 -0000 1.3 --- main.c 5 Feb 2006 13:18:30 -0000 1.4 *************** *** 942,946 **** int idx; int error = FALSE; - int k; while (!bQuit) { --- 942,945 ---- *************** *** 977,981 **** r++; } ! memcpy(radio_idx, ridx, sizeof (ridx)); list = sysclist(CMD_LIST_PHYMACSPEC, NULL, &col, &row); --- 976,980 ---- r++; } ! #if 0 memcpy(radio_idx, ridx, sizeof (ridx)); list = sysclist(CMD_LIST_PHYMACSPEC, NULL, &col, &row); *************** *** 993,997 **** } } ! for (k = 0, csm->ridx_slot = 0; k < MAXSHM_RADIO; k++) { if (radio_type[k] != IEEE802DOT11A && radio_type[k] != IEEE802DOT11B && --- 992,997 ---- } } ! ! for (k = 0, csm->ridx_slot = 0; k < MAXSHM_RADIO; k++) { if (radio_type[k] != IEEE802DOT11A && radio_type[k] != IEEE802DOT11B && *************** *** 1011,1014 **** --- 1011,1015 ---- if (!found) error = TRUE; + #endif csm->shared_mutex = MUTEX_UNLOCK; *************** *** 1132,1141 **** getif_info(1); ! if ( csm->snmp == SNMP_SUPPORT && csm->target == TARGET_CISCO_AP ){ is_radio_on(NULL); get_radio_maxpw(); } ! while (TRUE) { --- 1133,1143 ---- getif_info(1); ! #if 1 if ( csm->snmp == SNMP_SUPPORT && csm->target == TARGET_CISCO_AP ){ is_radio_on(NULL); get_radio_maxpw(); } ! #endif ! while (TRUE) { |
From: 똥꼬 <lin...@us...> - 2006-01-31 16:58:16
|
Update of /cvsroot/netadm/gwc/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4900 Modified Files: install.sh Log Message: MOD: add comment Index: install.sh =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.sh 31 Jan 2006 14:19:38 -0000 1.2 --- install.sh 31 Jan 2006 16:58:05 -0000 1.3 *************** *** 262,266 **** file_check(){ if [ ! -f gwccli/gwccli ]; then ! $DIALOG --infobox "gwccli binary does not exist , abort install ..." 5 75 sleep 2 abort_install --- 262,266 ---- file_check(){ if [ ! -f gwccli/gwccli ]; then ! $DIALOG --infobox "gwccli binary does not exist, compile first! abort install ..." 5 75 sleep 2 abort_install *************** *** 270,274 **** if [ ! -f gwcguid/gwcguid ]; then ! $DIALOG --infobox "gwcguid binary does not exist , abort install ..." 5 75 sleep 2 abort_install --- 270,274 ---- if [ ! -f gwcguid/gwcguid ]; then ! $DIALOG --infobox "gwcguid binary does not exist, compile first! abort install ..." 5 75 sleep 2 abort_install *************** *** 278,282 **** if [ ! -f gwcadmd/gwcadmd ]; then ! $DIALOG --infobox "gwcadmd binary does not exist , abort install ..." 5 75 sleep 2 abort_install --- 278,282 ---- if [ ! -f gwcadmd/gwcadmd ]; then ! $DIALOG --infobox "gwcadmd binary does not exist, compile first! abort install ..." 5 75 sleep 2 abort_install *************** *** 287,291 **** if [ $KVER == 2 ]; then if [ ! -f pf/pf.ko ]; then ! $DIALOG --infobox "pf module does not exist , abort install ..." 5 75 sleep 2 abort_install --- 287,291 ---- if [ $KVER == 2 ]; then if [ ! -f pf/pf.ko ]; then ! $DIALOG --infobox "pf module does not exist, compile first! abort install ..." 5 75 sleep 2 abort_install *************** *** 296,300 **** if [ ! -f scripts/gwc ]; then ! $DIALOG --infobox "gwc script does not exist , abort install ..." 5 75 sleep 2 abort_install --- 296,300 ---- if [ ! -f scripts/gwc ]; then ! $DIALOG --infobox "gwc script does not exist, abort install ..." 5 75 sleep 2 abort_install |
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); |
From: 똥꼬 <lin...@us...> - 2006-01-31 16:03:58
|
Update of /cvsroot/netadm/gwc/gwcadmd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16114/gwcadmd Modified Files: 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: main.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcadmd/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 *************** *** 1130,1138 **** out("starting...\n"); ! #if 0 getif_info(1); ! is_radio_on(NULL); ! get_radio_maxpw(); ! #endif while (TRUE) { --- 1130,1141 ---- out("starting...\n"); ! getif_info(1); ! ! if ( csm->snmp == SNMP_SUPPORT && csm->target == TARGET_CISCO_AP ){ ! is_radio_on(NULL); ! get_radio_maxpw(); ! } ! while (TRUE) { *************** *** 1173,1181 **** } ! if (pthread_create(&pid, &attr, is_radio_on, (void *) NULL) != ! 0) { ! out("Can't create is_radio_on thread: %s\n", ! strerror(errno)); ! goto EXIT2; } --- 1176,1186 ---- } ! if ( csm->snmp == SNMP_SUPPORT && csm->target == TARGET_CISCO_AP ){ ! if (pthread_create(&pid, &attr, is_radio_on, (void *) NULL) != ! 0) { ! out("Can't create is_radio_on thread: %s\n", ! strerror(errno)); ! goto EXIT2; ! } } *************** *** 1200,1207 **** bQuit = TRUE; } else if (!ret) { ! if (fork() == 0) { ! close(fd); ! goto EXIT2; ! } continue; } else { --- 1205,1209 ---- bQuit = TRUE; } else if (!ret) { ! out ("timeout continue ...\n"); continue; } else { *************** *** 1220,1223 **** --- 1222,1227 ---- if (!strcmp(cmd, "auto_apply")) { + + if ( csm->snmp == SNMP_SUPPORT && csm->target == TARGET_CISCO_AP ){ if (pthread_create (&pid, &attr, auto_apply, *************** *** 1226,1229 **** --- 1230,1237 ---- continue; } + } + else { + out ("%s received, but no valid SNMP and no CISCO AP\n", cmd); + } } |
From: 똥꼬 <lin...@us...> - 2006-01-31 14:52:15
|
Update of /cvsroot/netadm/gwc/gwcguid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21941 Modified Files: apc.c callback.c fwc.c interface.c interface.h qos.c Log Message: MOD: modify winError as userwin .. general user window Index: callback.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/callback.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** callback.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- callback.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 79,83 **** } else { ! winError((const char *) error); set_item_statusbar("Failed to Auto Test configp"); } --- 79,83 ---- } else { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("Failed to Auto Test configp"); } *************** *** 98,102 **** } else { ! winError((const char *) error); set_item_statusbar("Failed to apply Auto Test config"); } --- 98,102 ---- } else { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("Failed to apply Auto Test config"); } *************** *** 221,225 **** if (error != NULL) { ! winError((const char *) error); set_item_statusbar("SNMP set error"); free(error); --- 221,225 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("SNMP set error"); free(error); *************** *** 273,277 **** if (error == NULL) { ! winError((const char *) error); set_item_statusbar("AP set error"); } --- 273,277 ---- if (error == NULL) { ! userwin(USERWIN_ERROR, (const char *) error); set_item_statusbar("AP set error"); } *************** *** 683,690 **** if (error != NULL) { ! winError((const char *) error); set_item_statusbar("TC Power set error"); } ! syscmdfree(error); /* È¿¼®¾Æ .. Á¦¹ß howto ´ë·Î ¿¡¿Üó¸®ÇØÁà -_-;; */ } --- 683,690 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("TC Power set error"); } ! syscmdfree(error); } *************** *** 767,771 **** close_winError(GtkWidget * widget, GtkWidget * win) { - openError = 0; gtk_widget_hide(win); --- 767,770 ---- Index: apc.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/apc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** apc.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- apc.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 85,89 **** if (row == -1) { ! winError(list[0]); return -1; } --- 85,89 ---- if (row == -1) { ! userwin(USERWIN_ERROR, list[0]); return -1; } *************** *** 113,117 **** if (row == -1) { ! winError(list[0]); return -1; } --- 113,117 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 218,222 **** if (row == -1) { ! winError(list[0]); return -1; } --- 218,222 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 288,292 **** if (row == -1) { ! winError(list[0]); return -1; } --- 288,292 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 321,325 **** if (row == -1) { ! winError(list[0]); return -1; } --- 321,325 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 388,392 **** if (row == -1) { ! winError(list[0]); return -1; } --- 388,392 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 430,434 **** if (row == -1) { ! winError(list[0]); return -1; } --- 430,434 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 442,446 **** if (row == -1) { ! winError(list[0]); return -1; } --- 442,446 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 453,457 **** if (row == -1) { ! winError(list[0]); return -1; } --- 453,457 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } Index: interface.h =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** interface.h 30 Jan 2006 17:41:28 -0000 1.1.1.1 --- interface.h 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 21,24 **** --- 21,27 ---- g_object_set_data (G_OBJECT (component), name, widget) + #define USERWIN_INFO 0X00000000 + #define USERWIN_ERROR 0X00000001 + GtkWidget *create_window1(void); GtkWidget *create_window2(int count); *************** *** 32,36 **** GtkWidget *create_window12(void); GtkWidget *create_window13(void); ! GtkWidget *winError(const char *strError); GtkWidget *create_windowErrAdd(void); GtkWidget *create_windowBandAdd(int result); --- 35,39 ---- GtkWidget *create_window12(void); GtkWidget *create_window13(void); ! GtkWidget *userwin(int flag, const char *strError); GtkWidget *create_windowErrAdd(void); GtkWidget *create_windowBandAdd(int result); Index: qos.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/qos.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** qos.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- qos.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 127,131 **** if (error != NULL) { ! winError(error); set_item_statusbar("TC Apply Error"); } --- 127,131 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("TC Apply Error"); } *************** *** 345,349 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get interface error"); return -1; --- 345,349 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get interface error"); return -1; *************** *** 369,373 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("CMD_LIST_TC_MAXBW error"); return -1; --- 369,373 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("CMD_LIST_TC_MAXBW error"); return -1; *************** *** 394,398 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get band list Apply Error"); return -1; --- 394,398 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get band list Apply Error"); return -1; *************** *** 421,425 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get class list Apply Error"); return -1; --- 421,425 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get class list Apply Error"); return -1; *************** *** 449,453 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get filter list Apply Error"); return -1; --- 449,453 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get filter list Apply Error"); return -1; *************** *** 478,482 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get policy list Apply Error"); return -1; --- 478,482 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get policy list Apply Error"); return -1; *************** *** 685,689 **** if (error != NULL) { ! winError(error); set_item_statusbar("CMD_ADD_TC_MAXBW Error"); return; --- 685,689 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("CMD_ADD_TC_MAXBW Error"); return; *************** *** 738,742 **** if (error != NULL) { ! winError(error); set_item_statusbar("TC Apply Error"); return; --- 738,742 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("TC Apply Error"); return; *************** *** 815,819 **** if (error != NULL) { ! winError(error); set_item_statusbar("TC Apply Error"); return; --- 815,819 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("TC Apply Error"); return; *************** *** 915,919 **** if (error != NULL) { ! winError(error); set_item_statusbar("POLICY set Error"); return; --- 915,919 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("POLICY set Error"); return; *************** *** 936,940 **** if (error != NULL) { ! winError(error); } --- 936,940 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } *************** *** 955,959 **** if (error != NULL) { ! winError(error); } --- 955,959 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } *************** *** 974,978 **** if (error != NULL) { ! winError(error); } syscmdfree(error); --- 974,978 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } syscmdfree(error); *************** *** 992,996 **** if (error != NULL) { ! winError(error); } syscmdfree(error); --- 992,996 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } syscmdfree(error); Index: fwc.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/fwc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fwc.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- fwc.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 121,125 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get host policy list Error"); return -1; --- 121,125 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); set_item_statusbar("get host policy list Error"); return -1; *************** *** 173,177 **** if (error != NULL) { ! winError(error); set_item_statusbar("add Hostpol Error"); return; --- 173,177 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, error); set_item_statusbar("add Hostpol Error"); return; *************** *** 197,201 **** if (error != NULL) { ! winError(error); set_item_statusbar("delete Hostpol Error"); return; --- 197,201 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, error); set_item_statusbar("delete Hostpol Error"); return; *************** *** 216,220 **** if (error != NULL) { ! winError(error); set_item_statusbar("apply Hostpol Error"); return; --- 216,220 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, error); set_item_statusbar("apply Hostpol Error"); return; Index: interface.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** interface.c 31 Jan 2006 14:19:38 -0000 1.2 --- interface.c 31 Jan 2006 14:51:58 -0000 1.3 *************** *** 4639,4643 **** GtkWidget * ! winError(const char *strError) { if (openError == 1) --- 4639,4643 ---- GtkWidget * ! userwin(int flag, const char *str) { if (openError == 1) *************** *** 4687,4691 **** gtk_alignment_set_padding(GTK_ALIGNMENT(alignment316), 5, 5, 5, 5); ! label_err = gtk_label_new(strError); gtk_widget_show(label_err); gtk_container_add(GTK_CONTAINER(alignment316), label_err); --- 4687,4691 ---- gtk_alignment_set_padding(GTK_ALIGNMENT(alignment316), 5, 5, 5, 5); ! label_err = gtk_label_new(str); gtk_widget_show(label_err); gtk_container_add(GTK_CONTAINER(alignment316), label_err); |