Do not use functions for remote capture on local interfaces.

[obnox/wireshark/wip.git] / capture-pcap-util-unix.c

diff --git a/capture-pcap-util-unix.c b/capture-pcap-util-unix.c
index bfb124c538db8711ad31fdee0e2b4d209b9eb23e..589ac7d74403f112576af48b439a84180cc136e0 100644 (file)
--- a/capture-pcap-util-unix.c
+++ b/capture-pcap-util-unix.c
@@ -73,8 +73,39 @@ static void
 search_for_if_cb(gpointer data, gpointer user_data);
 #endif
 
+#ifdef HAVE_PCAP_REMOTE
 GList *
-get_interface_list(int *err, char *err_str)
+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)
 {
 #ifdef HAVE_PCAP_FINDALLDEVS
        return get_interface_list_findalldevs(err, err_str);
@@ -90,11 +121,15 @@ get_interface_list(int *err, char *err_str)
        int len, lastlen;
        char *buf;
        if_info_t *if_info;
+       char errbuf[PCAP_ERRBUF_SIZE];
 
        if (sock < 0) {
                *err = CANT_GET_INTERFACE_LIST;
-               g_snprintf(err_str, PCAP_ERRBUF_SIZE, "Error opening socket: %s",
-                   strerror(errno));
+               if (err_str != NULL) {
+                       *err_str = g_strdup_printf(
+                           "Can't get list of interfaces: error opening socket: %s",
+                           strerror(errno));
+               }
                return NULL;
        }
 
@@ -111,15 +146,19 @@ get_interface_list(int *err, char *err_str)
                memset (buf, 0, len);
                if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
                        if (errno != EINVAL || lastlen != 0) {
-                               g_snprintf(err_str, PCAP_ERRBUF_SIZE,
-                                       "SIOCGIFCONF ioctl error getting list of interfaces: %s",
-                                       strerror(errno));
+                               if (err_str != NULL) {
+                                       *err_str = g_strdup_printf(
+                                           "Can't get list of interfaces: SIOCGIFCONF ioctl error: %s",
+                                           strerror(errno));
+                               }
                                goto fail;
                        }
                } else {
                        if ((unsigned) ifc.ifc_len < sizeof(struct ifreq)) {
-                               g_snprintf(err_str, PCAP_ERRBUF_SIZE,
-                                       "SIOCGIFCONF ioctl gave too small return buffer");
+                               if (err_str != NULL) {
+                                       *err_str = g_strdup(
+                                           "Can't get list of interfaces: SIOCGIFCONF ioctl gave too small return buffer");
+                               }
                                goto fail;
                        }
                        if (ifc.ifc_len == lastlen)
@@ -160,14 +199,16 @@ 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)
                                goto next;
-                       g_snprintf(err_str, PCAP_ERRBUF_SIZE,
-                               "SIOCGIFFLAGS error getting flags for interface %s: %s",
-                           ifr->ifr_name, strerror(errno));
+                       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));
+                       }
                        goto fail;
                }
 
@@ -184,7 +225,7 @@ get_interface_list(int *err, char *err_str)
                 * supplied is too large, rather than just truncating it.
                 */
                pch = pcap_open_live(ifr->ifr_name, MIN_PACKET_SIZE, 0, 0,
-                   err_str);
+                   errbuf);
                if (pch == NULL)
                        goto next;
                pcap_close(pch);
@@ -230,7 +271,7 @@ get_interface_list(int *err, char *err_str)
         * Try opening it and, if that succeeds, add it to the end of
         * the list of interfaces.
         */
-       pch = pcap_open_live("any", MIN_PACKET_SIZE, 0, 0, err_str);
+       pch = pcap_open_live("any", MIN_PACKET_SIZE, 0, 0, errbuf);
        if (pch != NULL) {
                /*
                 * It worked; we can use the "any" device.
@@ -250,6 +291,8 @@ get_interface_list(int *err, char *err_str)
                 * No interfaces found.
                 */
                *err = NO_INTERFACES_FOUND;
+               if (err_str != NULL)
+                       *err_str = NULL;
        }
        return il;
 
@@ -294,7 +337,7 @@ get_compiled_pcap_version(GString *str)
 #ifdef HAVE_PCAP_VERSION
        extern char pcap_version[];
 
-       g_string_sprintfa(str, "with libpcap %s", pcap_version);
+       g_string_append_printf(str, "with libpcap %s", pcap_version);
 #else
        g_string_append(str, "with libpcap (version unknown)");
 #endif
@@ -306,9 +349,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