PR 11338 (partial): Used '@defined()' in inet_sock tapsets.

* tapset/inet_sock.stp (inet_get_local_port): Used '@defined' instead of a
  kernel version check.  Added RHEL4 support.
  (inet_get_ip_source): Now calls __ip_sock_daddr() to get daddr.

1 files changed, 7 insertions, 21 deletions

diff --git a/tapset/inet_sock.stp b/tapset/inet_sock.stp
index 3962f5a1..93ed98a4 100644
--- a/tapset/inet_sock.stp
+++ b/tapset/inet_sock.stp
@@ -1,7 +1,7 @@
 // inet_sock information tapset 
 // Copyright (C) 2006 IBM Corp.
 // Copyright (C) 2006 Intel Corporation.
-// Copyright (C) 2009 Red Hat, Inc.
+// Copyright (C) 2009-2010 Red Hat, Inc.
 //
 // This file is part of systemtap, and is free software.  You can
 // redistribute it and/or modify it under the terms of the GNU General
@@ -13,31 +13,17 @@
 // return.
 function inet_get_local_port:long(sock:long)
 {
-%(kernel_v < "2.6.11" %?
-  port = @cast(sock, "inet_sock", "kernel")->inet->num;
-%:
-%(kernel_v < "2.6.33" %?
-  port = @cast(sock, "inet_sock", "kernel")->num;
-%:
-  port = @cast(sock, "inet_sock", "kernel")->inet_num;
-%)
-%)
-  return port;
+    return (@defined(@cast(sock, "inet_sock")->inet_num)
+	    ? @cast(sock, "inet_sock")->inet_num # kernel >= 2.6.33
+	    : (@defined(@cast(sock, "inet_sock")->num)
+	       ? @cast(sock, "inet_sock", "kernel")->num # kernel >= 2.6.11
+	       : @cast(sock, "inet_sock", "kernel<net/ip.h>")->inet->num))
 }
 
 // Get IP source address string given a pointer to a kernel socket.
 function inet_get_ip_source:string(sock:long)
 {
-%(kernel_v < "2.6.11" %?
-  daddr = @cast(sock, "inet_sock", "kernel")->inet->daddr;
-%:
-%(kernel_v < "2.6.33" %?
-  daddr = @cast(sock, "inet_sock", "kernel")->daddr;
-%:
-  daddr = @cast(sock, "inet_sock", "kernel")->inet_daddr;
-%)
-%)
-  return daddr_to_string(daddr);
+    return daddr_to_string(__ip_sock_daddr(sock));
 }
 
 // Turns a daddr as found in an inet_sock into a dotted ip string.