diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-29 08:02:37 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-29 08:02:37 +0100 |
| commit | fae8f451ab932a9f1295d2748bc48b076bd43352 (patch) | |
| tree | 4fb1b1f4a34e13d9cf9a4fe4742a69a9532419d0 /runtime/net.h | |
| parent | 2275a915e02ca4fd1cd1b3c450b0089ae98bc907 (diff) | |
| parent | 48799529955eff8eb3120b02a356a92a8bd9b2ae (diff) | |
| download | rsyslog-fae8f451ab932a9f1295d2748bc48b076bd43352.tar.gz rsyslog-fae8f451ab932a9f1295d2748bc48b076bd43352.tar.bz2 rsyslog-fae8f451ab932a9f1295d2748bc48b076bd43352.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/net.h')
| -rw-r--r-- | runtime/net.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/runtime/net.h b/runtime/net.h index 0d36e824..092c3116 100644 --- a/runtime/net.h +++ b/runtime/net.h @@ -135,11 +135,11 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */ /* things to go away after proper modularization */ rsRetVal (*addAllowedSenderLine)(char* pName, uchar** ppRestOfConfLine); void (*PrintAllowedSenders)(int iListToPrint); - void (*clearAllowedSenders) (); + void (*clearAllowedSenders)(uchar*); void (*debugListenInfo)(int fd, char *type); int *(*create_udp_socket)(uchar *hostname, uchar *LogPort, int bIsServer); void (*closeUDPListenSockets)(int *finet); - int (*isAllowedSender)(struct AllowedSenders *pAllowRoot, struct sockaddr *pFrom, const char *pszFromHost); + int (*isAllowedSender)(uchar *pszType, struct sockaddr *pFrom, const char *pszFromHost); rsRetVal (*getLocalHostname)(uchar**); int (*should_use_so_bsdcompat)(void); /* permitted peer handling should be replaced by something better (see comments above) */ @@ -149,9 +149,6 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */ /* data members - these should go away over time... TODO */ int *pACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */ int *pACLDontResolve; /* add hostname to acl instead of resolving it to IP(s) */ - struct AllowedSenders *pAllowedSenders_UDP; - struct AllowedSenders *pAllowedSenders_TCP; - struct AllowedSenders *pAllowedSenders_GSS; ENDinterface(net) #define netCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */ |