From 6c12035a999135fc06fdea5b6eb6f49b86c4b949 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 24 Jul 2007 15:23:26 +0000 Subject: added freeInstance() call to output module interface; re-structured ressource release code in syslogd.c --- omfwd.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'omfwd.c') diff --git a/omfwd.c b/omfwd.c index b9197e92..cffd4ac2 100644 --- a/omfwd.c +++ b/omfwd.c @@ -442,6 +442,25 @@ static rsRetVal parseSelectorAct(uchar **pp, selector_t *f) return iRet; } +/* free an instance + */ +static rsRetVal freeInstance(selector_t *f) +{ + assert(f != NULL); + switch (f->f_type) { + case F_FORW: + case F_FORW_SUSP: + freeaddrinfo(f->f_un.f_forw.f_addr); + /* fall through */ + case F_FORW_UNKN: + if(f->f_un.f_forw.port != NULL) + free(f->f_un.f_forw.port); + break; + } + return RS_RET_OK; +} + + /* query an entry point */ static rsRetVal queryEtryPt(uchar *name, rsRetVal (**pEtryPoint)()) @@ -456,9 +475,9 @@ static rsRetVal queryEtryPt(uchar *name, rsRetVal (**pEtryPoint)()) *pEtryPoint = parseSelectorAct; } else if(!strcmp((char*) name, "isCompatibleWithFeature")) { *pEtryPoint = isCompatibleWithFeature; - } /*else if(!strcmp((char*) name, "freeInstance")) { - *pEtryPoint = freeInstanceFile; - }*/ + } else if(!strcmp((char*) name, "freeInstance")) { + *pEtryPoint = freeInstance; + } return(*pEtryPoint == NULL) ? RS_RET_NOT_FOUND : RS_RET_OK; } -- cgit