Changeset a984307 for examples

Timestamp:

07/20/16 16:01:58 (5 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

000726a

Parents:

733c8b4 (diff), 2b0eae9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/develop' into libtrace4

Conflicts:

INSTALL
README
lib/format_dpdk.c
lib/trace.c
tools/tracesplit/tracesplit.c

File:

• examples/tutorial/sourcedemo.c (modified) (3 diffs)

examples/tutorial/sourcedemo.c

@@ -28 +28 @@
 static inline void print_ip(struct sockaddr *ip) {
 
-        char str[20];
+        char str[40];
         
         /* Check the sockaddr family so we can cast it to the appropriate
@@ -37 +37 @@
                 /* Use inet_ntop to convert the address into a string using
                  * dotted decimal notation */
-                printf("%s ", inet_ntop(AF_INET, &(v4->sin_addr), str, 20));
+                printf("%s ", inet_ntop(AF_INET, &(v4->sin_addr), str, sizeof(str)));
         }
 
@@ -45 +45 @@
                 /* Use inet_ntop to convert the address into a string using
                  * IPv6 address notation */
-                printf("%s ", inet_ntop(AF_INET6, &(v6->sin6_addr), str, 20));
+                printf("%s ", inet_ntop(AF_INET6, &(v6->sin6_addr), str, sizeof(str)));
         }