Release: Prepare v1.2.2

Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>

Author: Stefan Raspl

Makefile

@@ -1,3 +1,4 @@
+
 #
 # SMC Tools - Shared Memory Communication Tools
 #
@@ -9,7 +10,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
-SMC_TOOLS_RELEASE = 1.2.1
+SMC_TOOLS_RELEASE = 1.2.2
 VER_MAJOR         = $(shell echo $(SMC_TOOLS_RELEASE) | cut -d '.' -f 1)
 
 ARCHTYPE = $(shell uname -m)
@@ -29,6 +30,7 @@ DESTDIR          ?=
 PREFIX            = /usr
 BINDIR		  = ${PREFIX}/bin
 MANDIR		  = ${PREFIX}/share/man
+BASH_AUTODIR	  = $(shell pkg-config --variable=completionsdir bash-completion 2>/dev/null)
 OWNER		  = $(shell id -un)
 GROUP		  = $(shell id -gn)
 INSTALL_FLAGS_BIN = -g $(GROUP) -o $(OWNER) -m755
@@ -107,6 +109,7 @@ smc_pnet: smc_pnet.c smc.h smctools_common.h
 		printf "* Install package..............: %-45s\n" "devel package for libnl3" >&2; \
 		printf "* Install package..............: %-45s\n" "devel package for libnl3-genl" >&2; \
 		printf "* NOTE: Package names might differ by platform\n" >&2; \
+		printf "*       On Ubuntu try libnl-3-dev and libnl-genl-3-dev\n" >&2; \
 		printf "**************************************************************\n" >&2; \
 		exit 1; \
 	fi
@@ -117,12 +120,13 @@ smcss: smcss.c smc_diag.h smctools_common.h
 
 install: all
 	echo "  INSTALL"
-	install -d -m755 $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)$(MANDIR)/man8
+	install -d -m755 $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man7 \
+	                 $(DESTDIR)$(BASH_AUTODIR) $(DESTDIR)$(MANDIR)/man8
 	install $(INSTALL_FLAGS_LIB) libsmc-preload.so $(DESTDIR)$(LIBDIR)
-ifeq ($(STUFF_32BIT),1)
-	install -d -m755 $(DESTDIR)$(LIBDIR32)
-	install $(INSTALL_FLAGS_LIB) libsmc-preload32.so $(DESTDIR)$(LIBDIR32)/libsmc-preload.so
-endif
+#ifeq ($(STUFF_32BIT),1)
+#	install -d -m755 $(DESTDIR)$(LIBDIR32)
+#	install $(INSTALL_FLAGS_LIB) libsmc-preload32.so $(DESTDIR)$(LIBDIR32)/libsmc-preload.so
+#endif
 	install $(INSTALL_FLAGS_BIN) smc_run $(DESTDIR)$(BINDIR)
 	install $(INSTALL_FLAGS_BIN) smcss $(DESTDIR)$(BINDIR)
 	install $(INSTALL_FLAGS_BIN) smc_pnet $(DESTDIR)$(BINDIR)
@@ -135,6 +139,13 @@ endif
 	install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8
 	install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8
 	install $(INSTALL_FLAGS_MAN) smcss.8 $(DESTDIR)$(MANDIR)/man8
+ifneq ($(BASH_AUTODIR),)
+	install $(INSTALL_FLAGS_MAN) smc-tools.autocomplete $(DESTDIR)$(BASH_AUTODIR)/smc-tools
+	ln -sfr $(DESTDIR)$(BASH_AUTODIR)/smc-tools $(DESTDIR)$(BASH_AUTODIR)/smc_rnics
+	ln -sfr $(DESTDIR)$(BASH_AUTODIR)/smc-tools $(DESTDIR)$(BASH_AUTODIR)/smc_dbg
+	ln -sfr $(DESTDIR)$(BASH_AUTODIR)/smc-tools $(DESTDIR)$(BASH_AUTODIR)/smcss
+	ln -sfr $(DESTDIR)$(BASH_AUTODIR)/smc-tools $(DESTDIR)$(BASH_AUTODIR)/smc_pnet
+endif
 
 clean:
 	echo "  CLEAN"

README.smctools

@@ -1,4 +1,4 @@
-SMC Tools (1.2.1)
+SMC Tools (1.2.2)
 ===================
 
 The SMC Tools provided in this package allow execution of existing TCP
@@ -46,12 +46,20 @@ For enhancements, please describe the proposed change and its benefits.
 Release History:
 ================
 
+1.2.2 (2019-10-24)
+    Changes:
+    - Add bash autocompletion support
+
+    Bug fixes:
+    - smcss: Do not show connection mode for already closed sockets
+    - smc_rnics: Set interface to "n/a" for ISM devices
+
 1.2.1 (2019-04-15)
     Bug fixes:
     - smc_rnics: Install man page on s390 only
     - smc-preload: Handle behavior flags in type argument to socket() call
     - Makefile: Fixed install target on Ubuntu for platforms other than s390
-    - smc_pnet: changes in support of kernel 5.1
+    - smc_pnet: Changes in support of kernel 5.1
 
 1.2.0 (2019-02-08)
     Changes:

smc-tools.autocomplete

@@ -0,0 +1,38 @@
+function _smc_pnet_complete_() {
+    case "${COMP_WORDS[COMP_CWORD-1]}" in
+        --interface*|-I*)
+            COMPREPLY=($(compgen -W "$(ls -1 /sys/class/net/)" -- "${COMP_WORDS[COMP_CWORD]}"))
+            return;;
+        --ibdevice*|-D*)
+            which smc_rnics >/dev/null
+            if [ $?  -eq 0 ]; then
+                COMPREPLY=($(compgen -W "$(smc_rnics | tail -n +3 | awk '{print($3)}' | uniq)" -- "${COMP_WORDS[COMP_CWORD]}"))
+            else
+                COMPREPLY=($(compgen -W "$(ls -1 /sys/bus/pci/devices)" -- "${COMP_WORDS[COMP_CWORD]}"))
+            fi
+            return;;
+        --ibport*|-P*)
+            ;;
+    esac
+
+    COMPREPLY=($(compgen -W "--help --version --add --delete --show --flush --interface --ibdevice --ibport" -- "${COMP_WORDS[COMP_CWORD]}"))
+}
+
+function _smc_rnics_complete_() {
+    case "${COMP_WORDS[COMP_CWORD-1]}" in
+        --enable|-e)
+            COMPREPLY=($(compgen -W "$(smc_rnics | grep -e "^ [[:space:]0-9a-f]\{2\}  0" | awk '{print($1)}')" -- "${COMP_WORDS[COMP_CWORD]}"))
+            return;;
+        --disable|-d)
+            COMPREPLY=($(compgen -W "$(smc_rnics | grep -e "^ [[:space:]0-9a-f]\{2\}  1" | awk '{print($1)}')" -- "${COMP_WORDS[COMP_CWORD]}"))
+            return;;
+    esac
+
+    COMPREPLY=($(compgen -W "--help --version --disable --enable --rawids" -- "${COMP_WORDS[COMP_CWORD]}"))
+}
+
+complete -W "--help --tgz --version" smc_dbg
+complete -W "--help --version --all --listening --debug --wide --smcd --smcr" smcss
+complete -F _smc_pnet_complete_ smc_pnet
+complete -F _smc_rnics_complete_ smc_rnics
+

smc_dbg

@@ -36,7 +36,7 @@ while [ $# -gt 0 ]; do
         "-t" | "--tgz" )
                 tgz="on";;
         "-v" | "--version" )
-		echo "smc_dbg utility, smc-tools-1.2.1 (5ad3088)";
+		echo "smc_dbg utility, smc-tools-1.2.2 (4335826)";
 		exit 0;;
         * )
         esac

smc_rnics

@@ -66,7 +66,7 @@ while [ $# -gt 0 ]; do
 	"-r" | "--rawids" )
 		rawIDs=1;;
 	"-v" | "--version" )
-		echo "smc_rnics utility, smc-tools-1.2.1 (5ad3088)";
+		echo "smc_rnics utility, smc-tools-1.2.2 (4335826)";
 		exit 0;;
 	"--" ) ;;
 	* )	format_fid "$1";
@@ -144,7 +144,8 @@ for fid in `ls -1 /sys/bus/pci/slots`; do
 		"0x1014" ) # IBM
 			case "$id" in
 			"0x04ed") dev_type="ISM";
-				  port="n/a";;
+				  port="n/a";
+				  int="n/a";;
 			"0x044b") continue;;		# zEDC
 			esac;;
 		"0x15b3" ) # Mellanox

smc_rnics.8

@@ -70,7 +70,8 @@ on how to enable a device that is offline.
 PCI ID in BDF (Bus:Device.Function) notation.
 
 .SS "PCHID"
-Physical channel identifier.
+Physical channel identifier, or virtual channel identifier (VCHID) for
+ISM devices.
 
 .SS "Type"
 Device type in human readable form. See option

smcss.c

@@ -331,6 +331,9 @@ static void show_one_smc_sock(struct nlmsghdr *nlh)
 		    r->id.idiag_dst, ntohs(r->id.idiag_dport));
 	printf("%-*s ", (int)MAX(ADDR_LEN_SHORT, strlen(txtbuf)), txtbuf);
 	printf("%04x ", r->id.idiag_if);
+	if (r->diag_state == 7)			/* CLOSED state */
+		goto newline;
+	
 	if (r->diag_mode == SMC_DIAG_MODE_FALLBACK_TCP) {
 		printf("TCP ");
 		/* when available print local and peer fallback reason code */

smctools_common.h

@@ -20,7 +20,7 @@
 #define STRINGIFY(x)		STRINGIFY_1(x)
 
 #define RELEASE_STRING	STRINGIFY (SMC_TOOLS_RELEASE)
-#define RELEASE_LEVEL   "5ad3088"
+#define RELEASE_LEVEL   "4335826"
 
 #define PF_SMC 43