mirror of
https://github.com/samba-team/samba.git
synced 2025-07-30 19:42:05 +03:00
r3443: the next stage in the include files re-organisation.
I have created the include/system/ directory, which will contain the wrappers for the system includes for logical subsystems. So far I have created include/system/kerberos.h and include/system/network.h, which contain all the system includes for kerberos code and networking code. These are the included in subsystems that need kerberos or networking respectively. Note that this method avoids the mess of #ifdef HAVE_XXX_H in every C file, instead each C module includes the include/system/XXX.h file for the logical system support it needs, and the details are kept isolated in include/system/ This patch also creates a "struct ipv4_addr" which replaces "struct in_addr" in our code. That avoids every C file needing to import all the system networking headers.
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
8e25117103
commit
2e25c71853
@ -20,6 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
#include "system/network.h"
|
||||
|
||||
/*
|
||||
The idea is that this file will eventually have wrappers around all
|
||||
@ -533,3 +534,24 @@ int sys_dup2(int oldfd, int newfd)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
const char *sys_inet_ntoa(struct ipv4_addr in)
|
||||
{
|
||||
struct in_addr in2;
|
||||
in2.s_addr = in.s_addr;
|
||||
return inet_ntoa(in2);
|
||||
}
|
||||
|
||||
uint32_t sys_inet_addr(const char *s)
|
||||
{
|
||||
return inet_addr(s);
|
||||
}
|
||||
|
||||
struct ipv4_addr sys_inet_makeaddr(int net, int host)
|
||||
{
|
||||
struct in_addr in;
|
||||
struct ipv4_addr in2;
|
||||
in = inet_makeaddr(net, host);
|
||||
in2.s_addr = in.s_addr;
|
||||
return in2;
|
||||
}
|
||||
|
Reference in New Issue
Block a user