i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed crashing bug on startup.

Browse Source 
Andrew, TCP is actually used in the build, so please test if it crashes before
  committing.
* Fixed some minor style issues.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18486 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-08-11 17:34:57 +00:00
parent e192628c47
commit 804ee69a78
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/tcp/tcp.cpp
+10 -8
View File
@@ -42,7 +42,7 @@
static net_domain *sDomain; static net_domain *sDomain;
static net_address_module_info *sAddressModule; static net_address_module_info *sAddressModule;
//static net_buffer_module_info *sBufferModule; net_buffer_module_info *sBufferModule;
static net_datalink_module_info *sDatalinkModule; static net_datalink_module_info *sDatalinkModule;
static net_stack_module_info *sStackModule; static net_stack_module_info *sStackModule;
static hash_table *sTCPHash; static hash_table *sTCPHash;
@@ -223,22 +223,23 @@ tcp_error_reply(net_protocol *protocol, net_buffer *causedError, uint32 code,
// #pragma mark - // #pragma mark -
static status_t static status_t
tcp_init() tcp_init()
{ {
status_t status; status_t status;
#if 0
sDomain = sStackModule->get_domain(AF_INET); sDomain = sStackModule->get_domain(AF_INET);
sAddressModule = sDomain->address_module; sAddressModule = sDomain->address_module;
#endif
status = get_module(NET_STACK_MODULE_NAME, (module_info **)&sStackModule); status = get_module(NET_STACK_MODULE_NAME, (module_info **)&sStackModule);
if (status < B_OK) if (status < B_OK)
return status; return status;
status = get_module(NET_BUFFER_MODULE_NAME, (module_info **)&sBufferModule);
/* status = get_module(NET_BUFFER_MODULE_NAME, (module_info **)&sBufferModule);
if (status < B_OK) if (status < B_OK)
goto err1;*/ goto err1;
status = get_module(NET_DATALINK_MODULE_NAME, (module_info **)&sDatalinkModule); status = get_module(NET_DATALINK_MODULE_NAME, (module_info **)&sDatalinkModule);
if (status < B_OK) if (status < B_OK)
goto err2; goto err2;
@@ -280,15 +281,15 @@ err4:
err3: err3:
put_module(NET_DATALINK_MODULE_NAME); put_module(NET_DATALINK_MODULE_NAME);
err2: err2:
/* put_module(NET_BUFFER_MODULE_NAME); put_module(NET_BUFFER_MODULE_NAME);
err1:*/ err1:
put_module(NET_STACK_MODULE_NAME); put_module(NET_STACK_MODULE_NAME);
TRACE(("init_tcp() fails with %lx (%s)\n", status, strerror(status))); TRACE(("init_tcp() fails with %lx (%s)\n", status, strerror(status)));
return status; return status;
} }
static status_t static status_t
tcp_uninit() tcp_uninit()
{ {
@@ -301,6 +302,7 @@ tcp_uninit()
return B_OK; return B_OK;
} }
static status_t static status_t
tcp_std_ops(int32 op, ...) tcp_std_ops(int32 op, ...)
{ {