Add $Id$, arrange that it's expanded, use native line endings.
[metze/wireshark/wip.git] / capture-pcap-util-unix.c
index ea8968b7d0322b8360684c843f3b887c683fe81e..31def40f786d776d8b3d3009f38f810a57586f12 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 
@@ -47,8 +45,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <pcap.h>
-
 /*
  * Keep Digital UNIX happy when including <net/if.h>.
  */
@@ -60,6 +56,7 @@ struct rtentry;
 # include <sys/sockio.h>
 #endif
 
+#include "capture_ifinfo.h"
 #include "capture-pcap-util.h"
 #include "capture-pcap-util-int.h"
 
@@ -73,6 +70,37 @@ static void
 search_for_if_cb(gpointer data, gpointer user_data);
 #endif
 
+#ifdef HAVE_PCAP_REMOTE
+GList *
+get_remote_interface_list(const char *hostname, const char *port,
+                          int auth_type, const char *username,
+                          const char *passwd, int *err, char **err_str)
+{
+    struct pcap_rmtauth auth;
+    char source[PCAP_BUF_SIZE];
+    char errbuf[PCAP_ERRBUF_SIZE];
+    GList *result;
+
+    if (pcap_createsrcstr(source, PCAP_SRC_IFREMOTE, hostname, port,
+                          NULL, errbuf) == -1) {
+        *err = CANT_GET_INTERFACE_LIST;
+        if (err_str != NULL)
+            *err_str = cant_get_if_list_error_message(errbuf);
+        return NULL;
+    }
+
+    auth.type = auth_type;
+    auth.username = g_strdup(username);
+    auth.password = g_strdup(passwd);
+
+    result = get_interface_list_findalldevs_ex(source, &auth, err, err_str);
+    g_free(auth.username);
+    g_free(auth.password);
+
+    return result;
+}
+#endif
+
 GList *
 get_interface_list(int *err, char **err_str)
 {
@@ -91,13 +119,14 @@ get_interface_list(int *err, char **err_str)
        char *buf;
        if_info_t *if_info;
        char errbuf[PCAP_ERRBUF_SIZE];
+       gboolean loopback;
 
        if (sock < 0) {
                *err = CANT_GET_INTERFACE_LIST;
                if (err_str != NULL) {
                        *err_str = g_strdup_printf(
                            "Can't get list of interfaces: error opening socket: %s",
-                           strerror(errno));
+                           g_strerror(errno));
                }
                return NULL;
        }
@@ -118,12 +147,12 @@ get_interface_list(int *err, char **err_str)
                                if (err_str != NULL) {
                                        *err_str = g_strdup_printf(
                                            "Can't get list of interfaces: SIOCGIFCONF ioctl error: %s",
-                                           strerror(errno));
+                                           g_strerror(errno));
                                }
                                goto fail;
                        }
                } else {
-                       if ((unsigned) ifc.ifc_len < sizeof(struct ifreq)) {
+                       if ((unsigned int) ifc.ifc_len < sizeof(struct ifreq)) {
                                if (err_str != NULL) {
                                        *err_str = g_strdup(
                                            "Can't get list of interfaces: SIOCGIFCONF ioctl gave too small return buffer");
@@ -168,7 +197,7 @@ get_interface_list(int *err, char **err_str)
                 * Get the interface flags.
                 */
                memset(&ifrflags, 0, sizeof ifrflags);
-               strncpy(ifrflags.ifr_name, ifr->ifr_name,
+               g_strlcpy(ifrflags.ifr_name, ifr->ifr_name,
                    sizeof ifrflags.ifr_name);
                if (ioctl(sock, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
                        if (errno == ENXIO)
@@ -176,7 +205,7 @@ get_interface_list(int *err, char **err_str)
                        if (err_str != NULL) {
                                *err_str = g_strdup_printf(
                                    "Can't get list of interfaces: SIOCGIFFLAGS error getting flags for interface %s: %s",
-                                   ifr->ifr_name, strerror(errno));
+                                   ifr->ifr_name, g_strerror(errno));
                        }
                        goto fail;
                }
@@ -206,14 +235,13 @@ get_interface_list(int *err, char **err_str)
                 * don't want a loopback interface to be the default capture
                 * device unless there are no non-loopback devices.
                 */
-               if_info = if_info_new(ifr->ifr_name, NULL);
+               loopback = ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
+                   strncmp(ifr->ifr_name, "lo", 2) == 0);
+               if_info = if_info_new(ifr->ifr_name, NULL, loopback);
                if_info_add_address(if_info, &ifr->ifr_addr);
-               if ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
-                   strncmp(ifr->ifr_name, "lo", 2) == 0) {
-                       if_info->loopback = TRUE;
+               if (loopback)
                        il = g_list_append(il, if_info);
-               } else {
-                       if_info->loopback = FALSE;
+               else {
                        il = g_list_insert(il, if_info, nonloopback_pos);
                        /*
                         * Insert the next non-loopback interface after this
@@ -246,7 +274,7 @@ get_interface_list(int *err, char **err_str)
                 * It worked; we can use the "any" device.
                 */
                if_info = if_info_new("any",
-                   "Pseudo-device that captures on all interfaces");
+                   "Pseudo-device that captures on all interfaces", FALSE);
                il = g_list_insert(il, if_info, -1);
                pcap_close(pch);
        }
@@ -303,13 +331,27 @@ cant_get_if_list_error_message(const char *err_str)
 void
 get_compiled_pcap_version(GString *str)
 {
-#ifdef HAVE_PCAP_VERSION
-       extern char pcap_version[];
-
-       g_string_sprintfa(str, "with libpcap %s", pcap_version);
-#else
-       g_string_append(str, "with libpcap (version unknown)");
-#endif
+       /*
+        * NOTE: in *some* flavors of UN*X, the data from a shared
+        * library might be linked into executable images that are
+        * linked with that shared library, in which case you could
+        * look at pcap_version[] to get the version with which
+        * the program was compiled.
+        *
+        * In other flavors of UN*X, that doesn't happen, so
+        * pcap_version[] gives you the version the program is
+        * running with, not the version it was built with, and,
+        * in at least some of them, if the length of a data item
+        * referred to by the executable - such as the pcap_version[]
+        * string - isn't the same in the version of the library
+        * with which the program was built and the version with
+        * which it was run, the run-time linker will complain,
+        * which is Not Good.
+        *
+        * So, for now, we just give up on reporting the version
+        * of libpcap with which we were compiled.
+        */
+       g_string_append(str, "with libpcap");
 }
 
 /*
@@ -318,9 +360,9 @@ get_compiled_pcap_version(GString *str)
 void
 get_runtime_pcap_version(GString *str)
 {
-       g_string_sprintfa(str, "with ");
+       g_string_append_printf(str, "with ");
 #ifdef HAVE_PCAP_LIB_VERSION
-       g_string_sprintfa(str, pcap_lib_version());
+       g_string_append(str, pcap_lib_version());
 #else
        g_string_append(str, "libpcap (version unknown)");
 #endif