From a731d1b178f0376106d7a9810b7da521466d16d1 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Sat, 3 Jan 2004 19:04:12 +0000 Subject: [PATCH] Commit recent changes. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5893 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../net/new_stack/arp/arp_module_x86.proj | Bin 11968 -> 11968 bytes .../kits/net/new_stack/atomizer/atomizer.c | 3 +- .../atomizer/atomizer_module_x86.proj | Bin 11891 -> 11891 bytes .../kits/net/new_stack/loopback/loopback.c | 26 ++++++++---------- .../net/new_stack/memory_pool/memory_pool.c | 2 +- .../memory_pool/memory_pool_module_x86.proj | Bin 11936 -> 11936 bytes .../net/new_stack/net_stack_server_x86.proj | Bin 11834 -> 11834 bytes 7 files changed, 15 insertions(+), 16 deletions(-) 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 a5f4927bfb8036c62b751069b922e30b1b6fd70a..7156652d909be34c80614d4762cf8cc07767950e 100644 GIT binary patch delta 57 zcmX>Qdmwhh1$LGbi!~Z1Z{Ty>EXwgyg}KLGeX^jgycp|T1_lNnAZ7w$h6W(E|Kxvi Jvzu-eBLFqM5Ul_J delta 57 zcmX>Qdmwhh1$LGTyHy${Z{Ty>EXwgyg;^&}W3r&GyciQN0|SEx5HkTWLjw@o=g+Fx J?511A2ml}c4{-nh 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 db0f56a89722583fbef9985270343b0e013a8912..311295975077375e6cd2992c0e03fa3bb82ad7b5 100644 GIT binary patch delta 81 zcmewy^Eqb21$LGhM|B$}Z{Ty>EXr|DMen!8UzdQQv~xNPV36|5;_u~L-i898ILkrx dhL+pnU^Ynd%P)(`in>b7pLCaOcGJ~m1OTTIA)x>O delta 81 zcmewy^Eqb21$LGd#}peTZ{Ty>EXr|DMNeAkuS-Bt+BqEtFi4S7`g=K-x1j(io-$pr cq2;zXm<^KrBBeB0QCEpso8NJ>o31V+0R5yJzyJUM 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 9ccc5754736e901173120a9d8ab8787b96d66cbc..19ff9627e1ef5758202fc254eb3f448614aab650 100644 GIT binary patch delta 82 zcmZ1wyC8PM1$GvJZ^{jmH}E-b7Uj67q9?8N*Cn7R?VJt+7^Fxk{k@#a+fV=$7ZFfy dXt^y8W`iWZNGVNL)Kz4$|G4@7W;fj^MgY7098~}S delta 82 zcmZ1wyC8PM1$LGh>}m~@H}E-b7Uj67q8DxW*Cn7R?VJt+7^FlQ{=J;b+fV=$pHrsR d&~jTG%mzt*i87q5sH@0gcWV8$&2G9;i~#ge9ykC1 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 dac134acc7145715a2e7e2d4a6ffeb90d824f759..fcf200a47d1d4929b6e5b666221b4a213b895885 100644 GIT binary patch delta 111 zcmdlLvnyu90XCKjAL)k43wRwjv$Ee)(d*Xz>k?3uwojV@3{tvu|6b1JZ72YWw>&Uu zXt^y8W`iWZbm?vu)L~*2y#VB}05KCtv;m0iKS?J}ex++YIa#-b`BdLlAUgm6vg{@a delta 111 zcmdlLvnyu90XCM7bm@l43wRwjv$Ee)(OWI{*Cn7RZJ#y+7^JKc`+GT;x1j(ie#KR- zq2;zXm<^KrvPx{TpbitG=xrc}1&EnIq76W7pFeBo