[Netadm-devel] gwc/scripts gwc,1.5,1.6 install.sh,1.16,1.17
Status: Beta
Brought to you by:
linuxpark
Menu
▾
▴
[Netadm-devel] gwc/scripts gwc,1.5,1.6 install.sh,1.16,1.17
|
From: linuxpark <lin...@us...> - 2006-04-30 18:47:29
|
Update of /cvsroot/netadm/gwc/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6021/scripts Modified Files: gwc install.sh Log Message: DEL: gwclib/syscrypto.c: remove LP5 for more good hash value. MOD: Makefile.tmpl: make disable -g flag and disable DEBUG, enable syslog as default. ADD: Makefile: add gwcsh and pf as subdirectories of recursive make. MOD: scripts/gwc: remove gwcguid MOD: scripts/install.sh: add gwcsh install routine and some modifying Index: gwc =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/gwc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gwc 6 Apr 2006 15:15:48 -0000 1.5 --- gwc 30 Apr 2006 18:47:25 -0000 1.6 *************** *** 180,184 **** init_ipc start gwcadmd ! start gwcguid insmod ${MODDIR}/sysktimer.ko insmod ${MODDIR}/pf.ko debug=0 --- 180,184 ---- init_ipc start gwcadmd ! #start gwcguid insmod ${MODDIR}/sysktimer.ko insmod ${MODDIR}/pf.ko debug=0 *************** *** 199,203 **** exit_ipc stop gwcadmd ! stop gwcguid rmmod pf rmmod sysktimer --- 199,203 ---- exit_ipc stop gwcadmd ! #stop gwcguid rmmod pf rmmod sysktimer Index: install.sh =================================================================== RCS file: /cvsroot/netadm/gwc/scripts/install.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** install.sh 6 Apr 2006 15:15:48 -0000 1.16 --- install.sh 30 Apr 2006 18:47:25 -0000 1.17 *************** *** 139,186 **** get_val() { ! echo -e "$1 \c" ! read $2 } get_kernel_info() { ! kernel_ver=`gwcadmd/gwcadmd -r` ! if [ ${kernel_ver} != "2.6" ]; then ! ERROR="Kernel must above than 2.6.0 but your kernel isn't so abort ..." ! $DIALOG --msgbox "${ERROR}" 20 75 || acex 0 ! abort_install ! log "$ERROR" ! exit 1 ! fi } init_config() { ! #KVER ! #REMOTE ! #TARGET_IP ! #CISCO_AP ! #SUPPORT_SNMP ! #SNMP_COMMUNITY_NAME ! echo -e "#SYS" > ${TMP_CONFIG} ! echo -e "#Last Updated: $(date)" >> ${TMP_CONFIG} ! echo -e "[qry_state]\t3" >> ${TMP_CONFIG} ! if [ ${CISCO_AP} == "" ]; then ! CISCO_AP="0" ! fi ! echo -e "[target_type]\t${CISCO_AP}" >> ${TMP_CONFIG} ! echo -e "[target]\t${TARGET_IP}\t${TARGET_MASK}" >> ${TMP_CONFIG} ! if [ ${SUPPORT_SNMP} == "" ]; then ! SUPPORT_SNMP="0" ! fi ! echo -e "[snmp]\t${SUPPORT_SNMP}" >> ${TMP_CONFIG} ! echo -e "[snmp_community]\t${SNMP_COMMUNITY_NAME}" >> ${TMP_CONFIG} ! echo -e "[fc_svc]\tanyTCP\ttcp\t0" >> ${TMP_CONFIG} ! echo -e "[fc_svc]\tanyUDP\tudp\t0" >> ${TMP_CONFIG} ! echo -e "[fc_svc]\tICMP\ticmp\t0" >> ${TMP_CONFIG} ! return } --- 139,182 ---- get_val() { ! echo -e "$1 \c" ! read $2 } get_kernel_info() { ! kernel_ver=`gwcadmd/gwcadmd -r` ! if [ ${kernel_ver} != "2.6" ]; then ! ERROR="Kernel must above than 2.6.0 but your kernel isn't so abort ..." ! $DIALOG --msgbox "${ERROR}" 20 75 || acex 0 ! abort_install ! log "$ERROR" ! exit 1 ! fi } init_config() { + echo -e "#SYS" > ${TMP_CONFIG} + echo -e "#Last Updated: $(date)" >> ${TMP_CONFIG} + echo -e "[qry_state]\t3" >> ${TMP_CONFIG} + + if [ ${CISCO_AP} == "" ]; then + CISCO_AP="0" + fi ! echo -e "[target_type]\t${CISCO_AP}" >> ${TMP_CONFIG} ! echo -e "[target]\t${TARGET_IP}\t${TARGET_MASK}" >> ${TMP_CONFIG} + if [ ${SUPPORT_SNMP} == "" ]; then + SUPPORT_SNMP="0" + fi + + echo -e "[snmp]\t${SUPPORT_SNMP}" >> ${TMP_CONFIG} + echo -e "[snmp_community]\t${SNMP_COMMUNITY_NAME}" >> ${TMP_CONFIG} + echo -e "[fc_svc]\tanyTCP\ttcp\t0" >> ${TMP_CONFIG} + echo -e "[fc_svc]\tanyUDP\tudp\t0" >> ${TMP_CONFIG} + echo -e "[fc_svc]\tICMP\ticmp\t0" >> ${TMP_CONFIG} + return } *************** *** 200,203 **** --- 196,200 ---- log "Removing binary..." rm -f ${BINDIR}/gwccli + rm -f ${BINDIR}/gwcsh rm -f ${BINDIR}/gwcguid rm -f ${BINDIR}/gwcadmd *************** *** 256,259 **** --- 253,257 ---- backup_files ${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} *************** *** 303,306 **** --- 301,313 ---- exit 1 fi + + if [ ! -f gwcsh/gwcsh ]; then + ERROR="gwcsh shell does not exist, compile first! abort install ..." + $DIALOG --infobox "${ERROR}" 5 75 + sleep 2 + abort_install + log "$ERROR" + exit 1 + fi if [ ! -f gwcguid/gwcguid ]; then *************** *** 385,399 **** module_check () { ! FILES=`find ${KERN} -name $1` ! if [ -n "${FILES}" ]; then ! $DIALOG --infobox "${FILES} found ..." 5 80 ! sleep 1 ! else ! ERROR="No ${FILES} found, abort install ..." ! $DIALOG --infobox "${ERROR}" 5 80 ! sleep 2 ! abort_install ! exit 1 ! fi } --- 392,406 ---- module_check () { ! FILES=`find ${KERN} -name $1` ! if [ -n "${FILES}" ]; then ! $DIALOG --infobox "${FILES} found ..." 5 80 ! sleep 1 ! else ! ERROR="No ${FILES} found, abort install ..." ! $DIALOG --infobox "${ERROR}" 5 80 ! sleep 2 ! abort_install ! exit 1 ! fi } *************** *** 513,518 **** %s/%s { Main start|stop script } %s/gwcadmd { Admin main Daemon } - %s/gwcguid { Guid Daemon } %s/gwccli { Cli command being able to replace of gwcguid } %s/pf { kernel module for controlling flow or modifying TCP header } --- 520,525 ---- %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 } *************** *** 533,538 **** fi ! warning ! warning intro trap abort_install 1 2 6 12 15 --- 540,544 ---- fi ! #warning intro trap abort_install 1 2 6 12 15 *************** *** 575,581 **** $DIALOG --infobox "Compiling pf module ..." 5 75 sleep 2 - cd pf - make - cd .. module_check ip_tables.ko --- 581,584 ---- |
