Changeset 467d2b9 in mainline

Timestamp:

2024-12-13T08:44:05Z (11 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

e1e8f7a

Parents:

f161ce1

git-author:

Nataliia Korop <n.corop08@…> (2024-11-10 18:34:17)

git-committer:

Nataliia Korop <n.corop08@…> (2024-12-13 08:44:05)

Message:

logger

Location:

uspace/lib/pcap

Files:

• include/pcap.h (modified) (5 diffs)
• src/pcap.c (modified) (1 diff)
• src/pcap_dumper.c (modified) (3 diffs)
• src/pcapdump_srv.c (modified) (4 diffs)

uspace/lib/pcap/include/pcap.h

@@ -58 +58 @@
 #define WIRESHARK_SNAPLEN 0xffff
 
-/** Header of the .pcap file
- */
+/** Header of the .pcap file. */
 typedef struct {
         uint32_t magic_number;
@@ -70 +69 @@
 } pcap_file_header_t;
 
+/** Header of the packet to be dumped to .pcap file. */
 typedef struct pcap_packet_header {
         uint32_t seconds_stamp;
@@ -79 +79 @@
 typedef struct pcap_writer pcap_writer_t;
 
+/** Operations for dumper. */
 typedef struct {
         errno_t (*open)(struct pcap_writer *, const char *);
@@ -85 +86 @@
         size_t (*write_buffer)(struct pcap_writer *, const void *, size_t);
         void (*close)(struct pcap_writer *);
-
 } pcap_writer_ops_t;
 
-/** Interface for working with .pcap file
- */
+/** Interface for working with .pcap file. */
 typedef struct pcap_writer {
         void *data;
@@ -95 +94 @@
 } pcap_writer_t;
 
-extern void pcap_writer_add_header(pcap_writer_t *);
+extern void pcap_writer_add_header(pcap_writer_t *writer);
 extern void pcap_writer_add_packet(pcap_writer_t *writer, const void *captured_packet, size_t size);
 extern void pcap_set_time(pcap_packet_header_t *header);

uspace/lib/pcap/src/pcap.c

@@ -53 +53 @@
 /** Add pcap file header to the new .pcap file.
  *
- * @param writer
+ * @param writer writer that has destination buffer and ops to write to destination buffer.
  *
  */

uspace/lib/pcap/src/pcap_dumper.c

@@ -36 +36 @@
 #include <errno.h>
 #include <str.h>
+#include <io/log.h>
 #include "pcap_dumper.h"
 
 /** Initialize writing to .pcap file.
  *
- * @param writer    Interface for working with .pcap file
- * @param filename  Name of the file for dumping packets
- * @return          EOK on success or an error code
+ * @param writer    Interface for working with .pcap file.
+ * @param filename  Name of the file for dumping packets.
+ * @return          EOK on success or an error code.
  *
  */
@@ -126 +127 @@
                 pcap_dumper_stop(dumper);
         }
+
         errno_t rc = dumper->writer.ops->open(&dumper->writer, name);
         if (rc == EOK) {
                 dumper->to_dump = true;
-        } else {
-                printf("Failed creating pcap dumper: %s", str_error(rc));
-        }
+        }
+
         fibril_mutex_unlock(&dumper->mutex);
         return rc;
@@ -188 +189 @@
         dumper->to_dump = false;
         dumper->writer.ops = NULL;
+
+        errno_t rc = log_init("pcap");
+        if (rc != EOK) {
+                printf("pcap : Failed to initialize log.\n");
+                return 1;
+        }
         return EOK;
 }

uspace/lib/pcap/src/pcapdump_srv.c

@@ -41 +41 @@
 #include <fibril_synch.h>
 #include <str.h>
+#include <io/log.h>
 
 #include "pcapdump_srv.h"
@@ -59 +60 @@
         free(data);
         if (rc != EOK) {
-                //TODO what?
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Starting the dumping was not successful.\n");
         }
         async_answer_0(icall, EOK);
@@ -85 +86 @@
         free(data);
         if (rc != EOK) {
-                //TODO what?
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Setting ops for dumper was not successful.\n");
         }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Setting ops for dumper was successful.\n");
+
         async_answer_0(icall, EOK);
-
 }
 
@@ -134 +137 @@
 
         if (rc != EOK) {
-                printf("Failed creating pcap interface: %s", str_error(rc));
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Failed creating pcap interface: %s", str_error(rc));
                 return rc;
         }
 
-        rc = async_create_port(INTERFACE_PCAP_CONTROL,
-            pcapdump_conn, dumper, &port);
+        rc = async_create_port(INTERFACE_PCAP_CONTROL, pcapdump_conn, dumper, &port);
         if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Failed creating port: %s", str_error(rc));
                 return rc;
         }