Changeset a2e3ee6 in mainline for uspace/app

Timestamp:

2013-06-20T16:45:58Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

Location:

uspace/app

Files:

• dnscfg/dnscfg.c (modified) (5 diffs)
• dnsres/dnsres.c (modified) (2 diffs)
• nettest1/nettest1.c (modified) (1 diff)
• nettest2/nettest2.c (modified) (1 diff)
• nettest3/nettest3.c (modified) (1 diff)
• nterm/conn.c (modified) (1 diff)
• ping/ping.c (modified) (5 diffs)

uspace/app/dnscfg/dnscfg.c

@@ -36 +36 @@
 
 #include <errno.h>
-#include <inet/addr2.h>
+#include <inet/addr.h>
 #include <inet/dnsr.h>
 #include <ipc/services.h>
@@ -71 +71 @@
         char *srv_addr  = argv[0];
         
-        inet2_addr_t addr;
-        int rc = inet2_addr_parse(srv_addr, &addr);
+        inet_addr_t addr;
+        int rc = inet_addr_parse(srv_addr, &addr);
         
         if (rc != EOK) {
@@ -91 +91 @@
 static int dnscfg_unset_ns(void)
 {
-        inet2_addr_t addr;
-        inet2_addr_empty(&addr);
+        inet_addr_t addr;
+        inet_addr_any(&addr);
         
         int rc = dnsr_set_srvaddr(&addr);
@@ -106 +106 @@
 static int dnscfg_print(void)
 {
-        inet2_addr_t addr;
+        inet_addr_t addr;
         int rc = dnsr_get_srvaddr(&addr);
         if (rc != EOK) {
@@ -114 +114 @@
         
         char *addr_str;
-        rc = inet2_addr_format(&addr, &addr_str);
+        rc = inet_addr_format(&addr, &addr_str);
         if (rc != EOK) {
                 printf("%s: Out of memory.\n", NAME);

uspace/app/dnsres/dnsres.c

@@ -34 +34 @@
 
 #include <errno.h>
-#include <inet/addr2.h>
+#include <inet/addr.h>
 #include <inet/dnsr.h>
 #include <stdio.h>
@@ -66 +66 @@
         }
 
-        rc = inet2_addr_format(&hinfo->addr, &saddr);
+        rc = inet_addr_format(&hinfo->addr, &saddr);
         if (rc != EOK) {
                 dnsr_hostinfo_destroy(hinfo);

uspace/app/nettest1/nettest1.c

@@ -360 +360 @@
                 }
                 
-                rc = inet2_addr_sockaddr_in(&hinfo->addr, &address_in);
+                rc = inet_addr_sockaddr_in(&hinfo->addr, &address_in);
                 if (rc != EOK) {
                         printf("Host '%s' not resolved as IPv4 address.\n", argv[argc - 1]);

uspace/app/nettest2/nettest2.c

@@ -306 +306 @@
                 }
                 
-                rc = inet2_addr_sockaddr_in(&hinfo->addr, &address_in);
+                rc = inet_addr_sockaddr_in(&hinfo->addr, &address_in);
                 if (rc != EOK) {
                         printf("Host '%s' not resolved as IPv4 address.\n", argv[argc - 1]);

uspace/app/nettest3/nettest3.c

@@ -84 +84 @@
                         }
                         
-                        rc = inet2_addr_sockaddr_in(&hinfo->addr, &addr);
+                        rc = inet_addr_sockaddr_in(&hinfo->addr, &addr);
                         if (rc != EOK) {
                                 printf("Host '%s' not resolved as IPv4 address.\n", argv[1]);

uspace/app/nterm/conn.c

@@ -91 +91 @@
                 }
                 
-                rc = inet2_addr_sockaddr_in(&hinfo->addr, &addr);
+                rc = inet_addr_sockaddr_in(&hinfo->addr, &addr);
                 if (rc != EOK) {
                         printf("Host '%s' not resolved as IPv4 address.\n", addr_s);

uspace/app/ping/ping.c

@@ -83 +83 @@
 static int ping_ev_recv(inetping_sdu_t *sdu)
 {
-        inet2_addr_t src_addr;
-        inet2_addr_unpack(sdu->src, &src_addr);
-        
-        inet2_addr_t dest_addr;
-        inet2_addr_unpack(sdu->dest, &dest_addr);
+        inet_addr_t src_addr;
+        inet_addr_unpack(sdu->src, &src_addr);
+        
+        inet_addr_t dest_addr;
+        inet_addr_unpack(sdu->dest, &dest_addr);
         
         char *asrc;
-        int rc = inet2_addr_format(&src_addr, &asrc);
+        int rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK)
                 return ENOMEM;
         
         char *adest;
-        rc = inet2_addr_format(&dest_addr, &adest);
+        rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
                 free(asrc);
@@ -207 +207 @@
 
         /* Parse destination address */
-        inet2_addr_t dest_addr;
-        rc = inet2_addr_parse(argv[argi], &dest_addr);
+        inet_addr_t dest_addr;
+        rc = inet_addr_parse(argv[argi], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
@@ -220 +220 @@
         }
         
-        rc = inet2_addr_pack(&dest_addr, &dest);
+        rc = inet_addr_pack(&dest_addr, &dest);
         if (rc != EOK) {
                 printf(NAME ": Destination '%s' is not an IPv4 address.\n",
@@ -234 +234 @@
         }
         
-        inet2_addr_t src_addr;
-        inet2_addr_unpack(src, &src_addr);
-        
-        rc = inet2_addr_format(&src_addr, &asrc);
+        inet_addr_t src_addr;
+        inet_addr_unpack(src, &src_addr);
+        
+        rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");
@@ -243 +243 @@
         }
         
-        rc = inet2_addr_format(&dest_addr, &adest);
+        rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");