diff --git a/src/tests/kits/net/new_stack/arp/arp_module_x86.proj b/src/tests/kits/net/new_stack/arp/arp_module_x86.proj index a5f4927bfb..7156652d90 100644 Binary files a/src/tests/kits/net/new_stack/arp/arp_module_x86.proj and b/src/tests/kits/net/new_stack/arp/arp_module_x86.proj differ diff --git a/src/tests/kits/net/new_stack/atomizer/atomizer.c b/src/tests/kits/net/new_stack/atomizer/atomizer.c index 40cb3609b8..f8e956e863 100644 --- a/src/tests/kits/net/new_stack/atomizer/atomizer.c +++ b/src/tests/kits/net/new_stack/atomizer/atomizer.c @@ -295,6 +295,7 @@ atomize(const void * at, const char *string, int create) { uint32 high = count; uint32 index = 0; int test = -1; + /* do a binary search on the vector for a match */ while (low < high) { index = (low + high) / 2; @@ -302,7 +303,7 @@ atomize(const void * at, const char *string, int create) { if (test < 0) high = index; else if (test > 0) - low = index + 1; + low = ++index; else break; } diff --git a/src/tests/kits/net/new_stack/atomizer/atomizer_module_x86.proj b/src/tests/kits/net/new_stack/atomizer/atomizer_module_x86.proj index db0f56a897..3112959750 100644 Binary files a/src/tests/kits/net/new_stack/atomizer/atomizer_module_x86.proj and b/src/tests/kits/net/new_stack/atomizer/atomizer_module_x86.proj differ diff --git a/src/tests/kits/net/new_stack/loopback/loopback.c b/src/tests/kits/net/new_stack/loopback/loopback.c index 3b8f6b23d1..7a2bddbc4d 100644 --- a/src/tests/kits/net/new_stack/loopback/loopback.c +++ b/src/tests/kits/net/new_stack/loopback/loopback.c @@ -6,10 +6,7 @@ #include #include -#include -#include - -#include +#include #include "net_stack.h" @@ -23,13 +20,13 @@ static struct net_stack_module_info *g_stack = NULL; // ------------------- status_t init(net_layer *me) { - printf("%s: initing layer\n", me->name); + dprintf("%s: initing layer\n", me->name); return B_OK; } status_t uninit(net_layer *me) { - printf("loopback: uniniting layer\n"); + dprintf("loopback: uniniting layer\n"); return B_OK; } @@ -40,12 +37,13 @@ status_t enable(net_layer *me, bool enable) } -status_t output_buffer(net_layer *me, net_buffer *buffer) +status_t process_output(net_layer *me, net_buffer *buffer) { if (!buffer) return B_ERROR; - - return g_stack->push_buffer_up(me, buffer); + + // Here the magical loopback effect ;-) + return g_stack->send_up(me, buffer); } // #pragma mark - @@ -56,16 +54,16 @@ status_t std_ops(int32 op, ...) case B_MODULE_INIT: { status_t status; - printf("loopback: B_MODULE_INIT\n"); + dprintf("loopback: B_MODULE_INIT\n"); status = get_module(NET_STACK_MODULE_NAME, (module_info **) &g_stack); if (status != B_OK) return status; - return g_stack->register_layer("*/loopback", &nlmi, NULL, NULL); + return g_stack->register_layer("loopback", "loopback/frame", 0, &nlmi, NULL, NULL); } case B_MODULE_UNINIT: - printf("loopback: B_MODULE_UNINIT\n"); + dprintf("loopback: B_MODULE_UNINIT\n"); put_module(NET_STACK_MODULE_NAME); break; @@ -86,8 +84,8 @@ struct net_layer_module_info nlmi = { uninit, enable, NULL, // no control() - output_buffer, - NULL // interface layer: no input_buffer() + NULL, // interface layer: processing input buffer doesn't make sense! + process_output }; _EXPORT module_info *modules[] = { diff --git a/src/tests/kits/net/new_stack/memory_pool/memory_pool.c b/src/tests/kits/net/new_stack/memory_pool/memory_pool.c index ea913c0459..82f2f370d4 100644 --- a/src/tests/kits/net/new_stack/memory_pool/memory_pool.c +++ b/src/tests/kits/net/new_stack/memory_pool/memory_pool.c @@ -256,7 +256,7 @@ status_t delete_pool_node2(memory_pool * pool, void * node) // #pragma mark - -struct memory_pool_module_info mpmi = { +memory_pool_module_info mpmi = { { MEMORY_POOL_MODULE_NAME, 0, diff --git a/src/tests/kits/net/new_stack/memory_pool/memory_pool_module_x86.proj b/src/tests/kits/net/new_stack/memory_pool/memory_pool_module_x86.proj index 9ccc575473..19ff9627e1 100644 Binary files a/src/tests/kits/net/new_stack/memory_pool/memory_pool_module_x86.proj and b/src/tests/kits/net/new_stack/memory_pool/memory_pool_module_x86.proj differ diff --git a/src/tests/kits/net/new_stack/net_stack_server_x86.proj b/src/tests/kits/net/new_stack/net_stack_server_x86.proj index dac134acc7..fcf200a47d 100644 Binary files a/src/tests/kits/net/new_stack/net_stack_server_x86.proj and b/src/tests/kits/net/new_stack/net_stack_server_x86.proj differ