[Netadm-devel] gwc/scripts gwc,1.7,1.8 install.sh,1.18,1.19 syslog.conf,1.4,1.5
Status: Beta
Brought to you by:
linuxpark
Menu
▾
▴
[Netadm-devel] gwc/scripts gwc,1.7,1.8 install.sh,1.18,1.19 syslog.conf,1.4,1.5
|
From: linuxpark <lin...@us...> - 2006-05-08 17:25:16
|
Update of /cvsroot/netadm/gwc/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28605/scripts Modified Files: gwc install.sh syslog.conf Log Message: ADD1: sysklog.ko, gwcklogd. MOD1: make deactivate gwcguid. MOD2: scripts/gwc, scripts/install.sh according to ADD1 and MOD1. FIX1: fix select maxfd from klogcmdtab[MAXSYSIDX] to klogcmdtab [MAXSYSIDX -1]. DEL1: remove debug code. ADD2: CHANGES according to ADD1, MOD1 MOD3: change syslog.conf to be able to handling gwcklogd log to local1 (gwc.log). OTHERS: comment and my email address. Index: syslog.conf =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/syslog.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** syslog.conf 6 Apr 2006 15:15:48 -0000 1.4 --- syslog.conf 6 May 2006 17:33:33 -0000 1.5 *************** *** 8,18 **** local0.* /usr/local/gwc/log/gwcadmd.log ! local1.* /usr/local/gwc/log/gwcguid.log - # Kernel Mode log - kern.* /usr/local/gwc/log/pf.log # Global Console ! *.err;kern.notice;auth.notice;local0.none;local1.none /dev/console ! *.err;kern.debug;daemon.notice;mail.crit /var/log/messages #*.alert;kern.err;daemon.err;local0.none operator --- 8,16 ---- local0.* /usr/local/gwc/log/gwcadmd.log ! local1.* /usr/local/gwc/log/gwc.log # Global Console ! #*.err;kern.notice;auth.notice;local0.none;local1.none /dev/console ! *.err;kern.*;daemon.notice;mail.crit /var/log/messages #*.alert;kern.err;daemon.err;local0.none operator Index: gwc =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/gwc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gwc 30 Apr 2006 19:34:18 -0000 1.7 --- gwc 6 May 2006 17:33:33 -0000 1.8 *************** *** 22,25 **** --- 22,43 ---- TC_CMD="/sbin/tc" + PF_DEV="/dev/pf" + PF_MAJOR_NUM=253 + PF_MINOR_NUM=0 + + GWC_PF_LDEV="/dev/gwc_pf" + GWC_PF_MAJORNUM=220 + GWC_PF_MINORNUM=0 + + GWC_KSYS_LDEV="/dev/gwc_ksys" + GWC_KSYS_MAJORNUM=221 + GWC_KSYS_MINORNUM=0 + + # mknod ${PF_DEV} c ${PF_MAJOR_NUM} ${PF_MINOR_NUM} + # mknod ${GWC_PF_LDEV} c ${GWC_PF_MAJORNUM} ${GWC_PF_MINORNUM} + # mknod ${GWC_KSYS_LDEV} c ${GWC_KSYS_MAJORNUM} ${GWC_KSYS_MINORNUM} + + DEBUG="1" + killproc() { pid=`/bin/ps -e | *************** *** 191,203 **** } case "$1" in 'start') ! reflesh_syslogd ! init_ipc ! start gwcadmd ! #start gwcguid ! insmod ${MODDIR}/sysktimer.ko ! insmod ${MODDIR}/pf.ko debug=0 reload ip_tables reload iptable_filter --- 209,234 ---- } + check_dev () { + + if [ ! -f ${PF_DEV} ]; then + mknod ${PF_DEV} c ${PF_MAJOR_NUM} ${PF_MINOR_NUM} + fi + + if [ ! -f ${GWC_PF_LDEV} ]; then + mknod ${GWC_PF_LDEV} c ${GWC_PF_MAJORNUM} ${GWC_PF_MINORNUM} + fi + + if [ ! -f ${GWC_KSYS_LDEV} ]; then + mknod ${GWC_KSYS_LDEV} c ${GWC_KSYS_MAJORNUM} ${GWC_KSYS_MINORNUM} + fi + } + case "$1" in 'start') ! check_dev reflesh_syslogd ! insmod ${MODDIR}/sysklog.ko debug=${DEBUG} ! insmod ${MODDIR}/sysktimer.ko debug=${DEBUG} ! insmod ${MODDIR}/pf.ko debug=${DEBUG} reload ip_tables reload iptable_filter *************** *** 211,214 **** --- 242,248 ---- reload sch_prio reload sch_sfq + init_ipc + start gwcadmd + start gwcklogd printf "\n" ;; *************** *** 216,220 **** exit_ipc stop gwcadmd - #stop gwcguid rmmod pf rmmod sysktimer --- 250,253 ---- *************** *** 230,233 **** --- 263,268 ---- rmmod sch_prio rmmod sch_sfq + stop gwcklogd + rmmod sysklog printf "\n" ;; Index: install.sh =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** install.sh 30 Apr 2006 19:34:19 -0000 1.18 --- install.sh 6 May 2006 17:33:33 -0000 1.19 *************** *** 3,7 **** # # Title : install.sh ! # Author : Jeho-Park <lin...@gm...> # Created date : 2006. 01. 31. (thu) 01:40:38 KST # Description : --- 3,7 ---- # # Title : install.sh ! # Author : Jeho-Park <de...@sk...> # Created date : 2006. 01. 31. (thu) 01:40:38 KST # Description : *************** *** 29,35 **** --- 29,48 ---- TMP_CONFIG=config.$$ MODDIR=${MAINDIR}/modules + + # network kernel module. PF_DEV="/dev/pf" PF_MAJOR_NUM=253 PF_MINOR_NUM=0 + + # char device for logging gwc packet log of pf.ko. + GWC_PF_LDEV="/dev/gwc_pf" + GWC_PF_MAJORNUM=220 + GWC_PF_MINORNUM=0 + + # char device for logging system log of all gwc kernel module. + GWC_KSYS_LDEV="/dev/gwc_ksys" + GWC_KSYS_MAJORNUM=221 + GWC_KSYS_MINORNUM=0 + KERN=/lib/modules/`uname -r` *************** *** 197,202 **** rm -f ${BINDIR}/gwccli rm -f ${BINDIR}/gwcsh ! rm -f ${BINDIR}/gwcguid rm -f ${BINDIR}/gwcadmd xecho "Removing shell scripts and config files..." log "Removing shell scripts and config files..." --- 210,216 ---- rm -f ${BINDIR}/gwccli rm -f ${BINDIR}/gwcsh ! # rm -f ${BINDIR}/gwcguid rm -f ${BINDIR}/gwcadmd + rm -f ${BINDIR}/gwcklogd xecho "Removing shell scripts and config files..." log "Removing shell scripts and config files..." *************** *** 210,213 **** --- 224,229 ---- rm -rf ${SNMP_INSTALL_PATH}/${SNMP_NAME} rm -rf ${PF_DEV} + rm -rf ${GWC_PF_LDEV} + rm -rf ${GWC_KSYS_LDEV} } *************** *** 252,259 **** ${INST} -m 700 -o root -g root gwccli/gwccli ${BINDIR} ${INST} -m 700 -o root -g root gwcsh/gwcsh ${BINDIR} ! ${INST} -m 700 -o root -g root gwcguid/gwcguid ${BINDIR} ${INST} -m 700 -o root -g root gwcadmd/gwcadmd ${BINDIR} ${INST} -m 644 -o root -g root pf/pf.ko ${MODDIR} ${INST} -m 644 -o root -g root pf/sysktimer.ko ${MODDIR} ${INST} -m 700 -o root -g root scripts/${RUNSHELL} ${BINDIR} ${INST} -m 644 -o root -g root scripts/syslog.conf /etc --- 268,277 ---- ${INST} -m 700 -o root -g root gwccli/gwccli ${BINDIR} ${INST} -m 700 -o root -g root gwcsh/gwcsh ${BINDIR} ! # ${INST} -m 700 -o root -g root gwcguid/gwcguid ${BINDIR} ${INST} -m 700 -o root -g root gwcadmd/gwcadmd ${BINDIR} + ${INST} -m 700 -o root -g root gwcklogd/gwcklogd ${BINDIR} ${INST} -m 644 -o root -g root pf/pf.ko ${MODDIR} ${INST} -m 644 -o root -g root pf/sysktimer.ko ${MODDIR} + ${INST} -m 644 -o root -g root pf/sysklog.ko ${MODDIR} ${INST} -m 700 -o root -g root scripts/${RUNSHELL} ${BINDIR} ${INST} -m 644 -o root -g root scripts/syslog.conf /etc *************** *** 262,266 **** --- 280,288 ---- rm -f ./${TMP_CONFIG} chmod -R og-s ${MAINDIR} + mknod ${PF_DEV} c ${PF_MAJOR_NUM} ${PF_MINOR_NUM} + mknod ${GWC_PF_LDEV} c ${GWC_PF_MAJORNUM} ${GWC_PF_MINORNUM} + mknod ${GWC_KSYS_LDEV} c ${GWC_KSYS_MAJORNUM} ${GWC_KSYS_MINORNUM} + tar jxvf scripts/${SNMP_ARCH_FILE} mv ${SNMP_NAME} ${SNMP_INSTALL_PATH} *************** *** 283,288 **** check_usr xecho "is stopped..." ! killproc gwcguid killproc gwcadmd rmmod pf return --- 305,311 ---- check_usr xecho "is stopped..." ! # killproc gwcguid killproc gwcadmd + killproc gwcklogd rmmod pf return *************** *** 308,314 **** exit 1 fi ! if [ ! -f gwcguid/gwcguid ]; then ! ERROR="gwcguid binary does not exist, compile first! abort install ..." $DIALOG --infobox "${ERROR}" 5 75 sleep 2 --- 331,348 ---- exit 1 fi + # + # todays, we don't support GUI interface. --LP (Linuxpark or called Jeho-Park) + # + # if [ ! -f gwcguid/gwcguid ]; then + # ERROR="gwcguid binary does not exist, compile first! abort install ..." + # $DIALOG --infobox "${ERROR}" 5 75 + # sleep 2 + # abort_install + # log "$ERROR" + # exit 1 + # fi ! if [ ! -f gwcadmd/gwcadmd ]; then ! ERROR="gwcadmd binary does not exist, compile first! abort install ..." $DIALOG --infobox "${ERROR}" 5 75 sleep 2 *************** *** 317,323 **** exit 1 fi ! ! if [ ! -f gwcadmd/gwcadmd ]; then ! ERROR="gwcadmd binary does not exist, compile first! abort install ..." $DIALOG --infobox "${ERROR}" 5 75 sleep 2 --- 351,357 ---- exit 1 fi ! ! if [ ! -f gwcklogd/gwcklogd ]; then ! ERROR="gwcklogd binary does not exist, compile first! abort install ..." $DIALOG --infobox "${ERROR}" 5 75 sleep 2 *************** *** 328,331 **** --- 362,374 ---- if [ $KVER == 2 ]; then + if [ ! -f pf/sysklog.ko ]; then + ERROR="sysklog module does not exist, compile first! abort install ..." + $DIALOG --infobox "${ERROR}" 5 75 + sleep 2 + abort_install + log "$ERROR" + exit 1 + fi + if [ ! -f pf/pf.ko ]; then ERROR="pf module does not exist, compile first! abort install ..." *************** *** 518,529 **** %s/%s { Main start|stop script } %s/gwcadmd { Admin main Daemon } %s/gwccli { Cli command being able to replace of gwcguid } %s/gwcsh { gwc shell for interfacing with main admin daemon(gwcadmd) } ! %s/pf { kernel module for controlling flow or modifying TCP header } netadm-gwc log ---------------------------- ! %s/log" ${PROD} ${MAINDIR} ${CONFDIR} ${BINDIR} ${RUNSHELL} ${BINDIR} ${BINDIR} ${BINDIR} ${MODDIR} ${MAINDIR}) $DIALOG --msgbox "$msg" 28 80 || acex 0 --- 561,577 ---- %s/%s { Main start|stop script } %s/gwcadmd { Admin main Daemon } + %s/gwcklogd { kernel log daemon only for gwc kernel module's log } %s/gwccli { Cli command being able to replace of gwcguid } %s/gwcsh { gwc shell for interfacing with main admin daemon(gwcadmd) } ! %s/pf.ko { kernel module for controlling flow or modifying TCP header } + %s/sysklog.ko + { kernel module for logging of gwc kernel modules } + %s/sysktimer.ko + { kernel module for dynamic kernel timer thread } netadm-gwc log ---------------------------- ! %s/log" ${PROD} ${MAINDIR} ${CONFDIR} ${BINDIR} ${BINDIR} ${RUNSHELL} ${BINDIR} ${BINDIR} ${BINDIR} ${MODDIR} ${MODDIR} ${MODDIR} ${MAINDIR}) $DIALOG --msgbox "$msg" 28 80 || acex 0 |
