Rev 4155 | Rev 4192 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4155 | Rev 4163 | ||
---|---|---|---|
Line 33... | Line 33... | ||
33 | /** @file |
33 | /** @file |
34 | */ |
34 | */ |
35 | 35 | ||
36 | #include <async.h> |
36 | #include <async.h> |
37 | #include <ctype.h> |
37 | #include <ctype.h> |
- | 38 | #include <ddi.h> |
|
38 | #include <errno.h> |
39 | #include <errno.h> |
39 | #include <malloc.h> |
40 | #include <malloc.h> |
40 | #include <stdio.h> |
41 | #include <stdio.h> |
41 | #include <task.h> |
42 | #include <task.h> |
42 | #include <unistd.h> |
43 | #include <unistd.h> |
Line 73... | Line 74... | ||
73 | #define NAME "Networking" |
74 | #define NAME "Networking" |
74 | 75 | ||
75 | #define LO_NAME "lo" |
76 | #define LO_NAME "lo" |
76 | #define LO_FILENAME "/srv/lo" |
77 | #define LO_FILENAME "/srv/lo" |
77 | #define DP8390_NAME "dp8390" |
78 | #define DP8390_NAME "dp8390" |
78 | #define DP8390_FILENAME "/srv/dp8380" |
79 | #define DP8390_FILENAME "/srv/dp8390" |
79 | #define ETHERNET_NAME "ethernet" |
80 | #define ETHERNET_NAME "ethernet" |
80 | #define ETHERNET_FILENAME "/srv/ethernet" |
81 | #define ETHERNET_FILENAME "/srv/eth" |
81 | #define IP_NAME "ip" |
82 | #define IP_NAME "ip" |
82 | #define IP_FILENAME "/srv/ip" |
83 | #define IP_FILENAME "/srv/ip" |
83 | 84 | ||
- | 85 | #define CONF_NAME "NAME" |
|
- | 86 | #define CONF_NETIF "NETIF" |
|
- | 87 | #define CONF_NIL "NIL" |
|
- | 88 | #define CONF_IL "IL" |
|
- | 89 | #define CONF_IRQ "IRQ" |
|
- | 90 | #define CONF_IO "IO" |
|
- | 91 | #define CONF_MTU "MTU" |
|
- | 92 | ||
84 | #define IPC_GET_DEVICE( call ) ( device_id_t ) IPC_GET_ARG1( * call ) |
93 | #define IPC_GET_DEVICE( call ) ( device_id_t ) IPC_GET_ARG1( * call ) |
85 | #define IPC_GET_COUNT( call ) ( int ) IPC_GET_ARG2( * call ) |
94 | #define IPC_GET_COUNT( call ) ( int ) IPC_GET_ARG2( * call ) |
86 | 95 | ||
87 | typedef struct module_struct module_t; |
96 | typedef struct module_struct module_t; |
88 | typedef module_t * module_ref; |
97 | typedef module_t * module_ref; |
Line 99... | Line 108... | ||
99 | GENERIC_CHAR_MAP_DECLARE( modules, module_t ) |
108 | GENERIC_CHAR_MAP_DECLARE( modules, module_t ) |
100 | 109 | ||
101 | struct module_struct{ |
110 | struct module_struct{ |
102 | task_id_t task_id; |
111 | task_id_t task_id; |
103 | services_t service; |
112 | services_t service; |
104 | int phone; |
113 | int phone; |
105 | int usage; |
114 | int usage; |
106 | const char * name; |
115 | char * name; |
107 | const char * filename; |
116 | char * filename; |
108 | }; |
117 | }; |
109 | 118 | ||
110 | /** A present network interface device. |
119 | /** A present network interface device. |
111 | */ |
120 | */ |
112 | struct netif{ |
121 | struct netif{ |
Line 146... | Line 155... | ||
146 | */ |
155 | */ |
147 | measured_strings_t configuration; |
156 | measured_strings_t configuration; |
148 | }; |
157 | }; |
149 | 158 | ||
150 | void networking_print_name( void ); |
159 | void networking_print_name( void ); |
151 | int add_module( module_ref * module, modules_ref modules, const char const * name, const char const * filename, services_t service, task_id_t task_id ); |
160 | int add_module( module_ref * module, modules_ref modules, char * name, char * filename, services_t service, task_id_t task_id ); |
152 | measured_string_ref configuration_find( measured_strings_ref configuration, const char * name ); |
161 | measured_string_ref configuration_find( measured_strings_ref configuration, const char * name ); |
153 | int networking_start_module( async_client_conn_t client_connection ); |
162 | int networking_start_module( async_client_conn_t client_connection ); |
154 | int networking_initialize( void ); |
163 | int networking_initialize( void ); |
155 | int networking_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ); |
164 | int networking_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ); |
156 | int net_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ); |
165 | int net_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ); |
157 | //int parse_line( measured_strings_ref configuration, char * line ); |
166 | //int parse_line( measured_strings_ref configuration, char * line ); |
158 | int add_configuration( measured_strings_ref configuration, const char * name, const char * value ); |
167 | int add_configuration( measured_strings_ref configuration, const char * name, const char * value ); |
159 | int read_configuration( void ); |
168 | int read_configuration( void ); |
160 | task_id_t spawn( const char * const fname ); |
169 | task_id_t spawn( char * fname ); |
161 | int startup( void ); |
170 | int startup( void ); |
162 | device_id_t generate_new_device_id( void ); |
171 | device_id_t generate_new_device_id( void ); |
163 | 172 | ||
164 | static networking_globals_t networking_globals; |
173 | static networking_globals_t networking_globals; |
165 | 174 | ||
Line 171... | Line 180... | ||
171 | 180 | ||
172 | void networking_print_name( void ){ |
181 | void networking_print_name( void ){ |
173 | printf( NAME ); |
182 | printf( NAME ); |
174 | } |
183 | } |
175 | 184 | ||
176 | int add_module( module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id ){ |
185 | int add_module( module_ref * module, modules_ref modules, char * name, char * filename, services_t service, task_id_t task_id ){ |
177 | ERROR_DECLARE; |
186 | ERROR_DECLARE; |
178 | 187 | ||
179 | module_ref tmp_module; |
188 | module_ref tmp_module; |
180 | 189 | ||
181 | tmp_module = ( module_ref ) malloc( sizeof( module_t )); |
190 | tmp_module = ( module_ref ) malloc( sizeof( module_t )); |
Line 264... | Line 273... | ||
264 | #ifdef NETWORKING_modular |
273 | #ifdef NETWORKING_modular |
265 | task_id = spawn( "/srv/ip" ); |
274 | task_id = spawn( "/srv/ip" ); |
266 | if( ! task_id ) return EINVAL; |
275 | if( ! task_id ) return EINVAL; |
267 | ERROR_PROPAGATE( add_module( NULL, & networking_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_id )); |
276 | ERROR_PROPAGATE( add_module( NULL, & networking_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_id )); |
268 | // if( ! spawn( "/srv/udp" )) return EINVAL; |
277 | // if( ! spawn( "/srv/udp" )) return EINVAL; |
269 | if( ! spawn( "/srv/tcp" )) return EINVAL; |
278 | // if( ! spawn( "/srv/tcp" )) return EINVAL; |
270 | // if( ! spawn( "/srv/socket" )) return EINVAL; |
279 | // if( ! spawn( "/srv/socket" )) return EINVAL; |
271 | // not always necesssary |
280 | // not always necesssary |
272 | // if( ! spawn( "/srv/arp" )) return EINVAL; |
281 | // if( ! spawn( "/srv/arp" )) return EINVAL; |
273 | // if( ! spawn( "/srv/rarp" )) return EINVAL; |
282 | // if( ! spawn( "/srv/rarp" )) return EINVAL; |
274 | // if( ! spawn( "/srv/icmp" )) return EINVAL; |
283 | // if( ! spawn( "/srv/icmp" )) return EINVAL; |
Line 430... | Line 439... | ||
430 | } |
439 | } |
431 | return EOK; |
440 | return EOK; |
432 | } |
441 | } |
433 | 442 | ||
434 | device_id_t generate_new_device_id( void ){ |
443 | device_id_t generate_new_device_id( void ){ |
435 | return netifs_count( & networking_globals.netifs ) + 1; |
444 | return device_assign_devno(); |
436 | } |
445 | } |
437 | 446 | ||
438 | int read_configuration( void ){ |
447 | int read_configuration( void ){ |
439 | ERROR_DECLARE; |
448 | ERROR_DECLARE; |
440 | 449 | ||
441 | netif_ref netif; |
450 | netif_ref netif; |
442 | measured_string_ref setting; |
451 | measured_string_ref setting; |
443 | services_t internet_service; |
452 | services_t internet_service; |
444 | int index; |
453 | int index; |
- | 454 | int irq; |
|
- | 455 | int io; |
|
- | 456 | int mtu; |
|
445 | 457 | ||
446 | // read general configuration |
458 | // read general configuration |
447 | ERROR_PROPAGATE( add_configuration( & networking_globals.configuration, "IPV", "4" )); |
459 | ERROR_PROPAGATE( add_configuration( & networking_globals.configuration, "IPV", "4" )); |
- | 460 | ERROR_PROPAGATE( add_configuration( & networking_globals.configuration, "MTU", "1500" )); |
|
448 | 461 | ||
449 | // read network interfaces configuration |
462 | // read network interfaces configuration |
450 | 463 | ||
451 | // static loopback initialization |
- | |
452 | // printf( "\nloopback initialization" ); |
- | |
453 | netif = ( netif_ref ) malloc( sizeof( netif_t )); |
464 | netif = ( netif_ref ) malloc( sizeof( netif_t )); |
454 | if( ! netif ) return ENOMEM; |
465 | if( ! netif ) return ENOMEM; |
455 | netif->id = generate_new_device_id(); |
466 | netif->id = generate_new_device_id(); |
456 | ERROR_PROPAGATE( measured_strings_initialize( & netif->configuration )); |
467 | ERROR_PROPAGATE( measured_strings_initialize( & netif->configuration )); |
- | 468 | if( ERROR_OCCURRED( add_configuration( & netif->configuration, "NAME", "eth0" )) |
|
- | 469 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "NETIF", DP8390_NAME )) |
|
- | 470 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "NIL", ETHERNET_NAME )) |
|
- | 471 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IL", IP_NAME )) |
|
- | 472 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IRQ", "9" )) |
|
- | 473 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IO", "300" )) |
|
- | 474 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IP_CONFIG", "STATIC" )) |
|
- | 475 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IP_ADDR", "10.0.2.5" )) |
|
- | 476 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "NETMASK", "255.255.255.0" )) |
|
- | 477 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "BROADCAST", "10.0.2.255" )) |
|
- | 478 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "GATEWAY", "10.0.2.2" )) |
|
- | 479 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "DNS1", "10.0.2.2" )) |
|
- | 480 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "DNS2", "10.0.2.2" )) |
|
- | 481 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "ARP", "ARP" ))){ |
|
- | 482 | measured_strings_destroy( & netif->configuration ); |
|
- | 483 | free( netif ); |
|
- | 484 | return ERROR_CODE; |
|
- | 485 | } |
|
457 | if( ERROR_OCCURRED( add_configuration( & netif->configuration, "NAME", LO_NAME )) |
486 | /* if( ERROR_OCCURRED( add_configuration( & netif->configuration, "NAME", LO_NAME )) |
458 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "NETIF", LO_NAME )) |
487 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "NETIF", LO_NAME )) |
459 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IL", IP_NAME )) |
488 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IL", IP_NAME )) |
460 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "MTU", "1500" )) |
- | |
461 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IP_CONFIG", "STATIC" )) |
489 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IP_CONFIG", "STATIC" )) |
462 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IP_ADDR", "127.0.0.1" )) |
490 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "IP_ADDR", "127.0.0.1" )) |
463 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "NETMASK", "255.0.0.0" ))){ |
491 | || ERROR_OCCURRED( add_configuration( & netif->configuration, "NETMASK", "255.0.0.0" ))){ |
464 | measured_strings_destroy( & netif->configuration ); |
492 | measured_strings_destroy( & netif->configuration ); |
465 | free( netif ); |
493 | free( netif ); |
466 | return ERROR_CODE; |
494 | return ERROR_CODE; |
467 | } |
495 | } |
468 | // mandatory name |
496 | */ // mandatory name |
469 | // printf( "\n\tname" ); |
- | |
470 | setting = measured_strings_find( & netif->configuration, "NAME", 0 ); |
497 | setting = measured_strings_find( & netif->configuration, CONF_NAME, 0 ); |
471 | if( ! setting ){ |
498 | if( ! setting ){ |
- | 499 | printf( "\nThe name is missing" ); |
|
472 | measured_strings_destroy( & netif->configuration ); |
500 | measured_strings_destroy( & netif->configuration ); |
473 | free( netif ); |
501 | free( netif ); |
474 | return EINVAL; |
502 | return EINVAL; |
475 | } |
503 | } |
476 | netif->name = setting->value; |
504 | netif->name = setting->value; |
477 | // printf( " %s OK", netif->name ); |
- | |
478 | // mandatory netif |
505 | // mandatory netif |
479 | // printf( "\n\tnetif" ); |
- | |
480 | setting = measured_strings_find( & netif->configuration, "NETIF", 0 ); |
506 | setting = measured_strings_find( & netif->configuration, CONF_NETIF, 0 ); |
481 | if( ! setting ){ |
507 | if( ! setting ){ |
482 | // printf( " unknown" ); |
508 | printf( "\nThe network interface driver is missing" ); |
483 | measured_strings_destroy( & netif->configuration ); |
509 | measured_strings_destroy( & netif->configuration ); |
484 | free( netif ); |
510 | free( netif ); |
485 | return EINVAL; |
511 | return EINVAL; |
486 | } |
512 | } |
487 | // printf( " find %s in %d?", setting->value, modules_count( & networking_globals.modules )); |
- | |
488 | netif->driver = modules_find( & networking_globals.modules, setting->value, 0 ); |
513 | netif->driver = modules_find( & networking_globals.modules, setting->value, 0 ); |
489 | if( ! netif->driver ){ |
514 | if( ! netif->driver ){ |
490 | // printf( " not found" ); |
515 | printf( "\nThe network interface driver is unknown" ); |
491 | // TODO register the unknown one |
516 | // TODO register the unknown one |
492 | measured_strings_destroy( & netif->configuration ); |
517 | measured_strings_destroy( & netif->configuration ); |
493 | free( netif ); |
518 | free( netif ); |
494 | return EINVAL; |
519 | return EINVAL; |
495 | } |
520 | } |
496 | // printf( " found" ); |
- | |
497 | if( ! netif->driver->task_id ){ |
521 | if( ! netif->driver->task_id ){ |
498 | netif->driver->task_id = spawn( netif->driver->filename ); |
522 | netif->driver->task_id = spawn( netif->driver->filename ); |
499 | if( ! netif->driver->task_id ){ |
523 | if( ! netif->driver->task_id ){ |
- | 524 | printf( "\nFailed to start the network interface driver" ); |
|
500 | measured_strings_destroy( & netif->configuration ); |
525 | measured_strings_destroy( & netif->configuration ); |
501 | free( netif ); |
526 | free( netif ); |
502 | return EINVAL; |
527 | return EINVAL; |
503 | } |
528 | } |
504 | } |
529 | } |
505 | // printf( " OK" ); |
- | |
506 | // optional link layer |
530 | // optional network interface layer |
507 | // printf( "\n\tlink layer" ); |
- | |
508 | setting = measured_strings_find( & netif->configuration, "NIL", 0 ); |
531 | setting = measured_strings_find( & netif->configuration, CONF_NIL, 0 ); |
509 | if( setting ){ |
532 | if( setting ){ |
510 | netif->nil = modules_find( & networking_globals.modules, setting->value, 0 ); |
533 | netif->nil = modules_find( & networking_globals.modules, setting->value, 0 ); |
511 | if( ! netif->nil ){ |
534 | if( ! netif->nil ){ |
- | 535 | printf( "\nThe network interface layer is unknown" ); |
|
512 | // TODO register the unknown one |
536 | // TODO register the unknown one |
513 | -- netif->driver->usage; |
537 | -- netif->driver->usage; |
514 | measured_strings_destroy( & netif->configuration ); |
538 | measured_strings_destroy( & netif->configuration ); |
515 | free( netif ); |
539 | free( netif ); |
516 | return EINVAL; |
540 | return EINVAL; |
517 | } |
541 | } |
518 | if( ! netif->nil->task_id ){ |
542 | if( ! netif->nil->task_id ){ |
519 | netif->nil->task_id = spawn( netif->nil->filename ); |
543 | netif->nil->task_id = spawn( netif->nil->filename ); |
520 | if( ! netif->nil->task_id ){ |
544 | if( ! netif->nil->task_id ){ |
- | 545 | printf( "\nFailed to start the network interface layer" ); |
|
521 | -- netif->driver->usage; |
546 | -- netif->driver->usage; |
522 | measured_strings_destroy( & netif->configuration ); |
547 | measured_strings_destroy( & netif->configuration ); |
523 | free( netif ); |
548 | free( netif ); |
524 | return EINVAL; |
549 | return EINVAL; |
525 | } |
550 | } |
526 | } |
551 | } |
527 | }else{ |
552 | }else{ |
528 | netif->nil = NULL; |
553 | netif->nil = NULL; |
529 | } |
554 | } |
530 | // mandatory internet layer |
555 | // mandatory internet layer |
531 | // printf( "\n\tinternet layer" ); |
- | |
532 | setting = measured_strings_find( & netif->configuration, "IL", 0 ); |
556 | setting = measured_strings_find( & netif->configuration, CONF_IL, 0 ); |
533 | if( ! setting ){ |
557 | if( ! setting ){ |
- | 558 | printf( "\nThe internet layer is missing" ); |
|
534 | -- netif->driver->usage; |
559 | -- netif->driver->usage; |
535 | -- netif->nil->usage; |
560 | -- netif->nil->usage; |
536 | measured_strings_destroy( & netif->configuration ); |
561 | measured_strings_destroy( & netif->configuration ); |
537 | free( netif ); |
562 | free( netif ); |
538 | return EINVAL; |
563 | return EINVAL; |
539 | } |
564 | } |
540 | // printf( " set %s", setting->value ); |
- | |
541 | netif->il = modules_find( & networking_globals.modules, setting->value, 0 ); |
565 | netif->il = modules_find( & networking_globals.modules, setting->value, 0 ); |
542 | if( ! netif->il ){ |
566 | if( ! netif->il ){ |
- | 567 | printf( "\nThe internet layer is unknown" ); |
|
543 | // TODO register the unknown one |
568 | // TODO register the unknown one |
544 | -- netif->driver->usage; |
569 | -- netif->driver->usage; |
545 | -- netif->nil->usage; |
570 | -- netif->nil->usage; |
546 | measured_strings_destroy( & netif->configuration ); |
571 | measured_strings_destroy( & netif->configuration ); |
547 | free( netif ); |
572 | free( netif ); |
548 | return EINVAL; |
573 | return EINVAL; |
549 | } |
574 | } |
550 | // printf( " found" ); |
- | |
551 | if( ! netif->il->task_id ){ |
575 | if( ! netif->il->task_id ){ |
552 | netif->il->task_id = spawn( netif->il->filename ); |
576 | netif->il->task_id = spawn( netif->il->filename ); |
553 | if( ! netif->il->task_id ){ |
577 | if( ! netif->il->task_id ){ |
- | 578 | printf( "\nFailed to start the internet layer" ); |
|
554 | -- netif->driver->usage; |
579 | -- netif->driver->usage; |
555 | -- netif->nil->usage; |
580 | -- netif->nil->usage; |
556 | measured_strings_destroy( & netif->configuration ); |
581 | measured_strings_destroy( & netif->configuration ); |
557 | free( netif ); |
582 | free( netif ); |
558 | return EINVAL; |
583 | return EINVAL; |
559 | } |
584 | } |
560 | } |
585 | } |
561 | index = netifs_add( & networking_globals.netifs, netif->id, netif ); |
586 | index = netifs_add( & networking_globals.netifs, netif->id, netif ); |
562 | if( index < 0 ){ |
587 | if( index < 0 ){ |
563 | free( netif ); |
588 | free( netif ); |
564 | return ERROR_CODE; |
589 | return index; |
565 | } |
590 | } |
566 | if( ERROR_OCCURRED( char_map_add( & networking_globals.netif_names, netif->name, 0, index ))){ |
591 | if( ERROR_OCCURRED( char_map_add( & networking_globals.netif_names, netif->name, 0, index ))){ |
567 | netifs_exclude_index( & networking_globals.netifs, index ); |
592 | netifs_exclude_index( & networking_globals.netifs, index ); |
568 | return ERROR_CODE; |
593 | return ERROR_CODE; |
569 | } |
594 | } |
570 | // printf( "\nloopback OK" ); |
- | |
571 | // end of the static loopback initialization |
595 | // end of the static loopback initialization |
572 | // startup the loopback interface |
596 | // startup the loopback interface |
573 | if( ! netif->driver->phone ){ |
597 | if( ! netif->driver->phone ){ |
574 | // printf( " connect?" ); |
- | |
575 | netif->driver->phone = connect_to_service( netif->driver->service ); |
598 | netif->driver->phone = connect_to_service( netif->driver->service ); |
576 | } |
599 | } |
- | 600 | setting = measured_strings_find( & netif->configuration, CONF_IRQ, 0 ); |
|
577 | // printf( " connected" ); |
601 | irq = setting ? strtol( setting->value, NULL, 10 ) : 0; |
- | 602 | setting = measured_strings_find( & netif->configuration, CONF_IO, 0 ); |
|
578 | // TODO io, irq |
603 | io = setting ? strtol( setting->value, NULL, 16 ) : 0; |
579 | ERROR_PROPAGATE( async_req_3_0( netif->driver->phone, NET_NETIF_PROBE, netif->id, 0, 0 )); |
604 | ERROR_PROPAGATE( async_req_3_0( netif->driver->phone, NET_NETIF_PROBE, netif->id, irq, io )); |
580 | ++ netif->driver->usage; |
605 | ++ netif->driver->usage; |
581 | if( netif->nil ){ |
606 | if( netif->nil ){ |
582 | if( ! netif->nil->phone ){ |
607 | if( ! netif->nil->phone ){ |
583 | netif->nil->phone = connect_to_service( netif->nil->service ); |
608 | netif->nil->phone = connect_to_service( netif->nil->service ); |
584 | } |
609 | } |
- | 610 | setting = measured_strings_find( & netif->configuration, CONF_MTU, 0 ); |
|
- | 611 | if( ! setting ){ |
|
- | 612 | setting = measured_strings_find( & networking_globals.configuration, CONF_MTU, 0 ); |
|
- | 613 | } |
|
- | 614 | mtu = setting ? strtol( setting->value, NULL, 10 ) : 0; |
|
585 | ERROR_PROPAGATE( async_req_2_0( netif->nil->phone, NET_NIL_DEVICE, netif->id, netif->driver->service )); |
615 | ERROR_PROPAGATE( async_req_3_0( netif->nil->phone, NET_NIL_DEVICE, netif->id, netif->driver->service, mtu )); |
586 | ++ netif->nil->usage; |
616 | ++ netif->nil->usage; |
587 | internet_service = netif->nil->service; |
617 | internet_service = netif->nil->service; |
588 | // printf( " OK" ); |
- | |
589 | }else{ |
618 | }else{ |
590 | internet_service = netif->driver->service; |
619 | internet_service = netif->driver->service; |
591 | // printf( " none" ); |
- | |
592 | } |
620 | } |
593 | if( ! netif->il->phone ){ |
621 | if( ! netif->il->phone ){ |
594 | // printf( " connect" ); |
- | |
595 | netif->il->phone = connect_to_service( netif->il->service ); |
622 | netif->il->phone = connect_to_service( netif->il->service ); |
596 | } |
623 | } |
597 | // TODO IL_BUNDLE |
624 | // TODO IL_BUNDLE |
598 | ERROR_PROPAGATE( async_req_2_0( netif->il->phone, NET_IL_DEVICE, netif->id, internet_service )); |
625 | ERROR_PROPAGATE( async_req_2_0( netif->il->phone, NET_IL_DEVICE, netif->id, internet_service )); |
599 | ++ netif->il->usage; |
626 | ++ netif->il->usage; |
600 | // TODO startup? |
627 | // TODO startup? |
601 | ERROR_PROPAGATE( async_req_1_0( netif->driver->phone, NET_NETIF_START, netif->id )); |
628 | ERROR_PROPAGATE( async_req_1_0( netif->driver->phone, NET_NETIF_START, netif->id )); |
602 | // printf( "\n LO OK" ); |
- | |
- | 629 | printf( "\nNew network interface started:\n\tname\t= %s\n\tid\t= %d\n\tdriver\t= %s\n\tnil\t= %s\n\til\t= %s", netif->name, netif->id, netif->driver->name, netif->nil ? netif->nil->name : NULL, netif->il->name ); |
|
603 | return EOK; |
630 | return EOK; |
604 | } |
631 | } |
605 | 632 | ||
606 | task_id_t spawn( const char * const fname ){ |
633 | task_id_t spawn( char * fname ){ |
607 | char * const argv[ 2 ] = { fname, NULL }; |
634 | char * argv[ 2 ]; |
- | 635 | // char * argv[ 4 ]; |
|
608 | task_id_t res; |
636 | task_id_t res; |
609 | 637 | ||
610 | // printf( "Spawning %s\n", fname ); |
638 | // printf( "Spawning %s\n", fname ); |
611 | // argv[ 0 ] = fname; |
639 | argv[ 0 ] = fname; |
612 | // argv[ 1 ] = NULL; |
640 | argv[ 1 ] = NULL; |
613 | res = task_spawn( fname, argv ); |
641 | res = task_spawn( fname, argv ); |
- | 642 | /* argv[ 0 ] = "/app/trace"; |
|
- | 643 | argv[ 1 ] = "+ti"; |
|
- | 644 | argv[ 2 ] = fname; |
|
- | 645 | argv[ 3 ] = NULL; |
|
- | 646 | res = task_spawn( "/app/trace", argv ); |
|
- | 647 | */ |
|
614 | if( res != 0 ){ |
648 | if( res != 0 ){ |
615 | /* Success */ |
649 | /* Success */ |
616 | usleep( 50000 ); |
650 | usleep( 50000 ); |
617 | } |
651 | } |
618 | return res; |
652 | return res; |