浏览代码

utils/kamctl: Add contact path parameter

Victor Seva 12 年之前
父节点
当前提交
a4fb559b56
共有 3 个文件被更改,包括 17 次插入6 次删除
  1. 8 1
      utils/kamctl/kamctl
  2. 3 0
      utils/kamctl/kamctl.8
  3. 6 5
      utils/kamctl/kamctl.ctlbase

+ 8 - 1
utils/kamctl/kamctl

@@ -2281,10 +2281,17 @@ usrloc() {
 				UL_EXPIRES=0
 				UL_FLAGS=0
 				BR_FLAGS=0
+				UL_PATH=0
 			elif [ $# -eq 4 ] ; then
 				UL_EXPIRES=$4
 				UL_FLAGS=0
 				BR_FLAGS=0
+				UL_PATH=0
+			elif [ $# -eq 5 ] ; then
+				UL_EXPIRES=$4
+				UL_FLAGS=0
+				BR_FLAGS=0
+				UL_PATH="$5"
 			else
 				usage_usrloc
 				exit 1
@@ -2317,7 +2324,7 @@ usrloc() {
 			fi
 
 			$CTLCMD ul_add "$USRLOC_TABLE" "$OSERUSER@$OSERDOMAIN" "$2" \
-"$UL_EXPIRES" "1.00" "0" "$UL_FLAGS" "$BR_FLAGS" "$ALL_METHODS"
+"$UL_EXPIRES" "1.00" "$UL_PATH" "$UL_FLAGS" "$BR_FLAGS" "$ALL_METHODS"
 			exit $?
 			;;
 		rm)

+ 3 - 0
utils/kamctl/kamctl.8

@@ -169,6 +169,9 @@ Introduce a permanent usrloc entry
 .TP
 .B ul add <username> <uri> <expires>
 Introduce a temporary usrloc entry
+.TP
+.B ul add <username> <uri> <expires> <path>
+Introduce a temporary usrloc entry including a path
 
 .TP 16
 .I Fifo commands:

+ 6 - 5
utils/kamctl/kamctl.ctlbase

@@ -67,11 +67,12 @@ usage_usrloc() {
 	mecho " -- command 'ul|alias' - manage user location or aliases"
 	echo
 cat <<EOF
- ul show [<username>]................ show in-RAM online users
- ul show --brief..................... show in-RAM online users in short format
- ul rm <username> [<contact URI>].... delete user's usrloc entries
- ul add <username> <uri> ............ introduce a permanent usrloc entry
- ul add <username> <uri> <expires> .. introduce a temporary usrloc entry
+ ul show [<username>]................... show in-RAM online users
+ ul show --brief........................ show in-RAM online users in short format
+ ul rm <username> [<contact URI>]....... delete user's usrloc entries
+ ul add <username> <uri> ............... introduce a permanent usrloc entry
+ ul add <username> <uri> <expires> ..... introduce a temporary usrloc entry
+ ul add <user> <uri> <expires> <path> .. introduce a temporary usrloc entry
 EOF
 }
 USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_usrloc"