Changes in / [10056483:b278b4e] in mainline

Location:

uspace

Files:

• app/netecho/print_error.c (modified) (1 diff)
• app/ping/ping.c (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/net/icmp_api.c (deleted)
• lib/c/generic/net/icmp_common.c (deleted)
• lib/c/include/ipc/icmp.h (deleted)
• lib/c/include/net/icmp_api.h (deleted)
• lib/c/include/net/icmp_codes.h (deleted)
• lib/c/include/net/icmp_common.h (deleted)
• lib/c/include/net/ip_codes.h (deleted)
• lib/c/include/sys/time.h (modified) (1 diff)
• lib/c/include/unistd.h (modified) (2 diffs)
• lib/net/il/ip_remote.c (modified) (1 diff)
• lib/net/include/icmp_client.h (modified) (1 diff)
• lib/net/include/icmp_header.h (modified) (1 diff)
• lib/net/include/icmp_interface.h (modified) (1 diff)
• lib/net/include/ip_client.h (modified) (1 diff)
• lib/net/include/ip_interface.h (modified) (2 diffs)
• lib/net/include/ip_local.h (modified) (1 diff)
• lib/net/include/ip_messages.h (modified) (1 diff)
• lib/net/include/ip_remote.h (modified) (1 diff)
• lib/net/netif/netif_local.c (modified) (1 diff)
• lib/net/netif/netif_remote.c (modified) (1 diff)
• lib/net/tl/icmp_client.c (modified) (1 diff)
• lib/net/tl/icmp_remote.c (modified) (2 diffs)
• lib/socket/Makefile (modified) (1 diff)
• lib/socket/generic/icmp_api.c (added)
• lib/socket/generic/icmp_common.c (added)
• lib/socket/include/icmp_api.h (added)
• lib/socket/include/icmp_codes.h (added)
• lib/socket/include/icmp_common.h (added)
• lib/socket/include/icmp_messages.h (added)
• lib/socket/include/ip_codes.h (added)
• srv/net/il/arp/arp.c (modified) (2 diffs)
• srv/net/il/ip/ip.c (modified) (2 diffs)
• srv/net/tl/icmp/icmp.c (modified) (5 diffs)
• srv/net/tl/icmp/icmp.h (modified) (2 diffs)
• srv/net/tl/tcp/tcp.c (modified) (1 diff)
• srv/net/tl/udp/udp.c (modified) (1 diff)

uspace/app/netecho/print_error.c

@@ -38 +38 @@
 #include <errno.h>
 
-#include <net/icmp_codes.h>
+#include <icmp_codes.h>
 
 #include "print_error.h"

uspace/app/ping/ping.c

@@ -45 +45 @@
 #include <arg_parse.h>
 
-#include <net/icmp_api.h>
+#include <icmp_api.h>
 #include <net/in.h>
 #include <net/in6.h>
 #include <net/inet.h>
 #include <net/socket_parse.h>
-#include <net/ip_codes.h>
+#include <ip_codes.h>
 
 #include "print_error.h"

uspace/lib/c/Makefile

@@ -100 +100 @@
         generic/vfs/canonify.c \
         generic/net/inet.c \
-        generic/net/icmp_common.c \
-        generic/net/icmp_api.c \
         generic/net/modules.c \
         generic/net/packet.c \

uspace/lib/c/include/sys/time.h

@@ -43 +43 @@
 typedef long suseconds_t;
 
-typedef uint32_t useconds_t;
-typedef uint32_t mseconds_t;
-
 struct timeval {
         time_t tv_sec;        /* seconds */

uspace/lib/c/include/unistd.h

@@ -37 +37 @@
 
 #include <sys/types.h>
-#include <time.h>
 #include <libarch/config.h>
 
@@ -57 +56 @@
         #define SEEK_END  2
 #endif
+
+typedef uint32_t useconds_t;
 
 extern int dup2(int oldfd, int newfd);

uspace/lib/net/il/ip_remote.c

@@ -72 +72 @@
 
 int ip_bind_service(services_t service, int protocol, services_t me,
-    async_client_conn_t receiver)
+    async_client_conn_t receiver, tl_received_msg_t tl_received_msg)
 {
         return (int) bind_service(service, (ipcarg_t) protocol, me, service,

uspace/lib/net/include/icmp_client.h

@@ -38 +38 @@
 #define __NET_ICMP_CLIENT_H__
 
-#include <net/icmp_codes.h>
+#include <icmp_codes.h>
 #include <net/packet.h>
 

uspace/lib/net/include/icmp_header.h

@@ -42 +42 @@
 
 #include <net/in.h>
-#include <net/icmp_codes.h>
+#include <icmp_codes.h>
 
 /** ICMP header size in bytes.

uspace/lib/net/include/icmp_interface.h

@@ -41 +41 @@
 #include <net/packet.h>
 #include <net/inet.h>
-#include <net/ip_codes.h>
-#include <net/icmp_codes.h>
-#include <net/icmp_common.h>
+#include <ip_codes.h>
+#include <icmp_codes.h>
+#include <icmp_common.h>
 
 /** @name ICMP module interface

uspace/lib/net/include/ip_client.h

@@ -42 +42 @@
 
 #include <net/packet.h>
-#include <net/ip_codes.h>
+#include <ip_codes.h>
 #include <ip_interface.h>
 

uspace/lib/net/include/ip_interface.h

@@ -42 +42 @@
 
 #include <net/in.h>
-#include <net/ip_codes.h>
+#include <ip_codes.h>
 
 #include <ip_remote.h>
@@ -74 +74 @@
  *  @param[in] me The requesting module service.
  *  @param[in] receiver The message receiver. Used for remote connection.
+ *  @param[in] tl_received_msg The message processing function. Used if bundled together.
  *  @returns The phone of the needed service.
  *  @returns EOK on success.
  *  @returns Other error codes as defined for the bind_service() function.
  */
-extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver);
+extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg);
 
 /** Connects to the IP module.

uspace/lib/net/include/ip_local.h

@@ -37 +37 @@
 #include <ipc/services.h>
 
-#include <net/ip_codes.h>
+#include <ip_codes.h>
 #include <net/inet.h>
 #include <net/in.h>

uspace/lib/net/include/ip_messages.h

@@ -43 +43 @@
 
 #include <net/in.h>
-#include <net/ip_codes.h>
+#include <ip_codes.h>
 
 /** IP module messages.

uspace/lib/net/include/ip_remote.h

@@ -37 +37 @@
 #include <ipc/services.h>
 
-#include <net/ip_codes.h>
+#include <ip_codes.h>
 #include <net/inet.h>
 #include <net/in.h>

uspace/lib/net/netif/netif_local.c

@@ -228 +228 @@
         
         return ERROR_CODE;
+}
+
+/** Create bidirectional connection with the network interface module and registers the message receiver.
+ *
+ * @param[in] service   The network interface module service.
+ * @param[in] device_id The device identifier.
+ * @param[in] me        The requesting module service.
+ * @param[in] receiver  The message receiver.
+ *
+ * @return The phone of the needed service.
+ * @return EOK on success.
+ * @return Other error codes as defined for the bind_service() function.
+ *
+ */
+int netif_bind_service_local(services_t service, device_id_t device_id,
+    services_t me, async_client_conn_t receiver)
+{
+        return EOK;
 }
 

uspace/lib/net/netif/netif_remote.c

@@ -91 +91 @@
 }
 
-/** Create bidirectional connection with the network interface module and
- * registers the message receiver.
- *
- * @param[in] service   The network interface module service.
- * @param[in] device_id The device identifier.
- * @param[in] me        The requesting module service.
- * @param[in] receiver  The message receiver.
- *
- * @return The phone of the needed service.
- * @return EOK on success.
- * @return Other error codes as defined for the bind_service() function.
- *
- */
 int netif_bind_service_remote(services_t service, device_id_t device_id, services_t me,
     async_client_conn_t receiver)

uspace/lib/net/tl/icmp_client.c

@@ -43 +43 @@
 #include <sys/types.h>
 
-#include <net/icmp_codes.h>
+#include <icmp_codes.h>
 #include <icmp_client.h>
 #include <net/packet.h>

uspace/lib/net/tl/icmp_remote.c

@@ -40 +40 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <ipc/icmp.h>
 #include <sys/types.h>
 
@@ -47 +46 @@
 #include <icmp_interface.h>
 #include <packet_client.h>
+#include <icmp_messages.h>
 
 int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet){

uspace/lib/socket/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        generic/icmp_common.c \
+        generic/icmp_api.c \
         packet/packet_server.c
 

uspace/srv/net/il/arp/arp.c

@@ -227 +227 @@
         printf("Device %d cleared\n", device_id);
         fibril_rwlock_write_unlock(&arp_globals.lock);
+        return EOK;
+}
+
+int arp_connect_module(services_t service){
+        if(service != SERVICE_ARP){
+                return EINVAL;
+        }
         return EOK;
 }
@@ -596 +603 @@
         nil_send_msg(device->phone, device_id, packet, SERVICE_ARP);
         return NULL;
+}
+
+int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data){
+        measured_string_ref tmp;
+
+        fibril_rwlock_read_lock(&arp_globals.lock);
+        tmp = arp_translate_message(device_id, protocol, address);
+        if(tmp){
+                *translation = measured_string_copy(tmp);
+                fibril_rwlock_read_unlock(&arp_globals.lock);
+                if(*translation){
+                        *data = (** translation).value;
+                        return EOK;
+                }else{
+                        return ENOMEM;
+                }
+        }else{
+                fibril_rwlock_read_unlock(&arp_globals.lock);
+                return ENOENT;
+        }
 }
 

uspace/srv/net/il/ip/ip.c

@@ -58 +58 @@
 #include <net_device.h>
 #include <icmp_client.h>
-#include <net/icmp_codes.h>
+#include <icmp_codes.h>
 #include <icmp_interface.h>
 #include <il_interface.h>
@@ -618 +618 @@
         printf("%s: Device %d changed state to %d\n", NAME, device_id, state);
         fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
+        return EOK;
+}
+
+int ip_connect_module(services_t service){
         return EOK;
 }

uspace/srv/net/tl/icmp/icmp.c

@@ -44 +44 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <ipc/icmp.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -60 +59 @@
 #include <packet_remote.h>
 #include <net_checksum.h>
-#include <net/icmp_api.h>
+#include <icmp_api.h>
 #include <icmp_client.h>
-#include <net/icmp_codes.h>
-#include <net/icmp_common.h>
+#include <icmp_codes.h>
+#include <icmp_common.h>
 #include <icmp_interface.h>
 #include <il_interface.h>
@@ -72 +71 @@
 #include <tl_interface.h>
 #include <tl_local.h>
+#include <icmp_messages.h>
 #include <icmp_header.h>
 
@@ -449 +449 @@
 }
 
+int icmp_connect_module(services_t service, suseconds_t timeout){
+        icmp_echo_ref echo_data;
+        icmp_param_t id;
+        int index;
+
+        echo_data = (icmp_echo_ref) malloc(sizeof(*echo_data));
+        if(! echo_data){
+                return ENOMEM;
+        }
+        // assign a new identifier
+        fibril_rwlock_write_lock(&icmp_globals.lock);
+        index = icmp_bind_free_id(echo_data);
+        if(index < 0){
+                free(echo_data);
+                fibril_rwlock_write_unlock(&icmp_globals.lock);
+                return index;
+        }else{
+                id = echo_data->identifier;
+                fibril_rwlock_write_unlock(&icmp_globals.lock);
+                // return the echo data identifier as the ICMP phone
+                return id;
+        }
+}
+
 int icmp_initialize(async_client_conn_t client_connection){
         ERROR_DECLARE;
@@ -461 +485 @@
         icmp_replies_initialize(&icmp_globals.replies);
         icmp_echo_data_initialize(&icmp_globals.echo_data);
-        icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP, client_connection);
+        icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP, client_connection, icmp_received_msg);
         if(icmp_globals.ip_phone < 0){
                 return icmp_globals.ip_phone;

uspace/srv/net/tl/icmp/icmp.h

@@ -40 +40 @@
 #include <fibril_synch.h>
 
-#include <net/icmp_codes.h>
+#include <icmp_codes.h>
 #include <adt/int_map.h>
 #include <icmp_header.h>
@@ -67 +67 @@
 
 /** Echo specific data map.
+ *  The bundle module gets an identifier of the assigned echo specific data while connecting.
  *  The identifier is used in the future semi-remote calls instead of the ICMP phone.
  */

uspace/srv/net/tl/tcp/tcp.c

@@ -260 +260 @@
             ICMP_CONNECT_TIMEOUT);
         tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
-            SERVICE_TCP, client_connection);
+            SERVICE_TCP, client_connection, tcp_received_msg);
         if (tcp_globals.ip_phone < 0)
                 return tcp_globals.ip_phone;

uspace/srv/net/tl/udp/udp.c

@@ -241 +241 @@
             ICMP_CONNECT_TIMEOUT);
         udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP,
-            SERVICE_UDP, client_connection);
+            SERVICE_UDP, client_connection, udp_received_msg);
         if (udp_globals.ip_phone < 0)
                 return udp_globals.ip_phone;