Changeset 0b749a3 in mainline for uspace/srv/net/net/net_standalone.c
- Timestamp:
- 2010-11-22T15:39:53Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0eddb76, aae339e9
- Parents:
- 9a1d8ab (diff), 8cd1aa5e (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/net/net_standalone.c
r9a1d8ab r0b749a3 28 28 29 29 /** @addtogroup net 30 * 30 * @{ 31 31 */ 32 32 33 33 /** @file 34 * 34 * Wrapper for the standalone networking module. 35 35 */ 36 37 #include <str.h>38 39 #include <ipc/ipc.h>40 41 #include <net_messages.h>42 #include <ip_interface.h>43 #include <adt/measured_strings.h>44 #include <adt/module_map.h>45 #include <packet/packet_server.h>46 36 47 37 #include "net.h" 48 38 49 /** Networking module global data. 50 */ 39 #include <str.h> 40 #include <adt/measured_strings.h> 41 #include <adt/module_map.h> 42 #include <ipc/ipc.h> 43 #include <ipc/net.h> 44 #include <errno.h> 45 46 #include <ip_interface.h> 47 #include <packet_server.h> 48 49 /** Networking module global data. */ 51 50 extern net_globals_t net_globals; 52 51 … … 60 59 * 61 60 */ 62 int net_initialize_build(async_client_conn_t client_connection){ 63 ERROR_DECLARE; 61 int net_initialize_build(async_client_conn_t client_connection) 62 { 63 int rc; 64 64 65 65 task_id_t task_id = spawn("/srv/ip"); … … 67 67 return EINVAL; 68 68 69 ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME, 70 IP_FILENAME, SERVICE_IP, task_id, ip_connect_module)); 69 rc = add_module(NULL, &net_globals.modules, IP_NAME, 70 IP_FILENAME, SERVICE_IP, task_id, ip_connect_module); 71 if (rc != EOK) 72 return rc; 71 73 72 74 if (!spawn("/srv/icmp")) … … 94 96 * @return EOK on success. 95 97 * @return ENOTSUP if the message is not known. 96 * @return Other error codes as defined for each bundled module 97 * message function. 98 * @return Other error codes. 98 99 * 99 100 */
Note:
See TracChangeset
for help on using the changeset viewer.