From 917c92eeed38fcaab0b841a16d5fdf04a0499867 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Thu, 25 Sep 2003 13:52:42 +0000 Subject: [PATCH] Check-in often, they says... git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4812 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kits/net/new_stack/stack/buffer.c | 12 +++++++--- src/tests/kits/net/new_stack/stack/buffer.h | 1 + .../kits/net/new_stack/stack/layers_manager.c | 24 +++++++++++++++++++ .../kits/net/new_stack/stack/layers_manager.h | 21 ++++++++-------- src/tests/kits/net/new_stack/stack/stack.c | 1 + src/tests/kits/net/new_stack/stack/timer.c | 2 +- 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/tests/kits/net/new_stack/stack/buffer.c b/src/tests/kits/net/new_stack/stack/buffer.c index 0924450e3f..a9cbea08bf 100644 --- a/src/tests/kits/net/new_stack/stack/buffer.c +++ b/src/tests/kits/net/new_stack/stack/buffer.c @@ -95,7 +95,7 @@ status_t start_buffers_service() #endif // fire buffers_purgatory_thread - g_buffers_purgatory_thread = spawn_kernel_thread(buffers_purgatory_thread, "net buffers serial killer", B_LOW_PRIORITY, 0); + g_buffers_purgatory_thread = spawn_kernel_thread(buffers_purgatory_thread, "buffers serial killer", B_LOW_PRIORITY, 0); if (g_buffers_purgatory_thread < B_OK) return g_buffers_purgatory_thread; @@ -242,6 +242,12 @@ net_buffer * split_buffer(net_buffer *buffer, uint32 offset) return NULL; // B_UNSUPPORTED; } +// -------------------------------------------------- +status_t merge_buffers(net_buffer *begin_buffer, net_buffer *end_buffer) +{ + return B_ERROR; +} + // -------------------------------------------------- status_t attach_buffer_free_element(net_buffer *buffer, void *arg1, void *arg2, buffer_chunk_free_func freethis) @@ -514,7 +520,7 @@ status_t find_buffer_attribut(net_buffer *buffer, const char *name, int *type, v } -// #pragma mark [data(s) queues functions] +// #pragma mark [buffer(s) queues functions] // -------------------------------------------------- net_buffer_queue * new_buffer_queue(size_t max_bytes) @@ -834,7 +840,7 @@ void dump_memory for (j = i; j < len && j < i+16;j++) { - if ( byte[j] >= ' ' && byte[j] < 0x7e ) + if ( byte[j] >= 0x20 && byte[j] < 0x7e ) *ptr = byte[j]; else *ptr = '.'; diff --git a/src/tests/kits/net/new_stack/stack/buffer.h b/src/tests/kits/net/new_stack/stack/buffer.h index c44823810b..800d13b606 100644 --- a/src/tests/kits/net/new_stack/stack/buffer.h +++ b/src/tests/kits/net/new_stack/stack/buffer.h @@ -23,6 +23,7 @@ extern status_t delete_buffer(net_buffer *buffer, bool interrupt_safe); extern net_buffer * duplicate_buffer(net_buffer *from); extern net_buffer * clone_buffer(net_buffer *from); extern net_buffer * split_buffer(net_buffer *from, uint32 offset); +extern status_t merge_buffers(net_buffer *begin, net_buffer *end); extern status_t add_to_buffer(net_buffer *buffer, uint32 offset, const void *data, uint32 bytes, buffer_chunk_free_func freethis); extern status_t remove_from_buffer(net_buffer *buffer, uint32 offset, uint32 bytes); diff --git a/src/tests/kits/net/new_stack/stack/layers_manager.c b/src/tests/kits/net/new_stack/stack/layers_manager.c index 10cf552c49..1c60907e38 100644 --- a/src/tests/kits/net/new_stack/stack/layers_manager.c +++ b/src/tests/kits/net/new_stack/stack/layers_manager.c @@ -210,6 +210,30 @@ status_t unregister_layer(net_layer *layer) } +// -------------------------------------------------- +net_layer * find_layer(const char *name) +{ + net_layer *layer; + status_t status; + + if (!name) + return NULL; + + status = acquire_sem(g_layers.lock); + if (status != B_OK) + return NULL; + + layer = g_layers.first; + while (layer) { + if (strcmp(layer->name, name) == 0) + break; + layer = layer->next; + } + release_sem(g_layers.lock); + return layer; +} + + // -------------------------------------------------- status_t add_layer_attribut(net_layer *layer, const char *name, int type, ...) { diff --git a/src/tests/kits/net/new_stack/stack/layers_manager.h b/src/tests/kits/net/new_stack/stack/layers_manager.h index 55f433322d..015210ac1d 100644 --- a/src/tests/kits/net/new_stack/stack/layers_manager.h +++ b/src/tests/kits/net/new_stack/stack/layers_manager.h @@ -11,20 +11,21 @@ extern "C" { #endif -extern status_t start_layers_manager(); -extern status_t stop_layers_manager(); +extern status_t start_layers_manager(); +extern status_t stop_layers_manager(); -extern status_t register_layer(const char *name, net_layer_module_info *module, void *cookie, +extern status_t register_layer(const char *name, net_layer_module_info *module, void *cookie, net_layer **me); -extern status_t unregister_layer(net_layer *layer); +extern status_t unregister_layer(net_layer *layer); +extern net_layer * find_layer(const char *name); -extern status_t add_layer_attribut(net_layer *layer, const char *name, int type, ...); -extern status_t remove_layer_attribut(net_layer *layer, const char *name); -extern status_t find_layer_attribut(net_layer *layer, const char *name, - int *type, void **attribut, size_t *size); +extern status_t add_layer_attribut(net_layer *layer, const char *name, int type, ...); +extern status_t remove_layer_attribut(net_layer *layer, const char *name); +extern status_t find_layer_attribut(net_layer *layer, const char *name, + int *type, void **attribut, size_t *size); -extern status_t push_buffer_up(net_layer *me, struct net_buffer *buffer); -extern status_t push_buffer_down(net_layer *me, struct net_buffer *buffer); +extern status_t push_buffer_up(net_layer *me, struct net_buffer *buffer); +extern status_t push_buffer_down(net_layer *me, struct net_buffer *buffer); #ifdef __cplusplus diff --git a/src/tests/kits/net/new_stack/stack/stack.c b/src/tests/kits/net/new_stack/stack/stack.c index d159352302..bc5c94bd87 100644 --- a/src/tests/kits/net/new_stack/stack/stack.c +++ b/src/tests/kits/net/new_stack/stack/stack.c @@ -73,6 +73,7 @@ struct net_stack_module_info nsmi = { // Layers handling register_layer, unregister_layer, + find_layer, add_layer_attribut, remove_layer_attribut, find_layer_attribut, diff --git a/src/tests/kits/net/new_stack/stack/timer.c b/src/tests/kits/net/new_stack/stack/timer.c index e1ab5fc6bb..ac53f4fce2 100644 --- a/src/tests/kits/net/new_stack/stack/timer.c +++ b/src/tests/kits/net/new_stack/stack/timer.c @@ -57,7 +57,7 @@ status_t start_timers_service() set_sem_owner(g_timers.wait, B_SYSTEM_TEAM); #endif - g_timers_thread = spawn_kernel_thread(timers_thread, "net timers lone runner", B_URGENT_DISPLAY_PRIORITY, &g_timers); + g_timers_thread = spawn_kernel_thread(timers_thread, "timers lone runner", B_URGENT_DISPLAY_PRIORITY, &g_timers); if (g_timers_thread < B_OK) return g_timers_thread;