Changeset 31d2aee in mainline for uspace

Timestamp:

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

Author:

Nataliia Korop <n.corop08@…>

Children:

28ed2d89

Parents:

e5b2777

git-author:

Nataliia Korop <n.corop08@…> (2024-11-23 08:40:45)

git-committer:

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

Message:

Renaming

Location:

uspace/lib

Files:

• nic/include/nic_driver.h (modified) (1 diff)
• nic/src/nic_driver.c (modified) (1 diff)
• pcap/include/pcap.h (modified) (1 diff)
• pcap/src/pcap_dumper.c (modified) (2 diffs)

uspace/lib/nic/include/nic_driver.h

@@ -197 +197 @@
         poll_request_handler on_poll_request;
 
-        /** Interface for dumping packets */
-        pcap_dumper_t pcapdump;
+        /** Packets dumper. */
+        pcap_dumper_t dumper;
 
         /** Data specific for particular driver */

uspace/lib/nic/src/nic_driver.c

@@ -1143 +1143 @@
 pcap_dumper_t *nic_get_pcap_dumper(nic_t *nic_data)
 {
-        return &nic_data->pcapdump;
+        return &nic_data->dumper;
 }
 

uspace/lib/pcap/include/pcap.h

@@ -83 +83 @@
 typedef struct {
         errno_t (*open)(pcap_writer_t *, const char *);
-        size_t (*write_u32)(struct pcap_writer *, uint32_t);
-        size_t (*write_u16)(struct pcap_writer *, uint16_t);
-        size_t (*write_buffer)(struct pcap_writer *, const void *, size_t);
-        void (*close)(struct pcap_writer *);
+        size_t (*write_u32)(pcap_writer_t *, uint32_t);
+        size_t (*write_u16)(pcap_writer_t *, uint16_t);
+        size_t (*write_buffer)(pcap_writer_t *, const void *, size_t);
+        void (*close)(pcap_writer_t *);
 } pcap_writer_ops_t;
 

uspace/lib/pcap/src/pcap_dumper.c

@@ -102 +102 @@
 }
 
+static size_t pcap_short_file_wbuffer(pcap_writer_t *writer, const void *data, size_t size)
+{
+        return fwrite(data, 1, size < SHORT_OPS_BYTE_COUNT ? size : SHORT_OPS_BYTE_COUNT, (FILE *)writer->data);
+}
+
 static const pcap_writer_ops_t file_ops = {
         .open = &pcap_writer_to_file_init,
@@ -109 +114 @@
         .close = &pcap_file_close
 };
-
-static size_t pcap_short_file_wbuffer(pcap_writer_t *writer, const void *data, size_t size)
-{
-        return fwrite(data, 1, size < 60 ? size : 60, (FILE *)writer->data); //define
-}
 
 static const pcap_writer_ops_t short_file_ops = {