9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing cache.c compilation - code stolen from ratbox3, with irc dictionary addition

Browse source
This commit is contained in:
Valery Yatsko 2008-04-02 04:15:58 +04:00
parent e335494516
commit 0ccdff98ac
2 changed files with 282 additions and 264 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/cache.h
View file

@ -1,13 +1,13 @@
/* $Id: cache.h 6 2005-09-10 01:02:21Z nenolod $ */ /* $Id: cache.h 24250 2007-08-22 19:15:08Z androsyn $ */
#ifndef INCLUDED_CACHE_H #ifndef INCLUDED_CACHE_H
#define INCLUDED_CACHE_H #define INCLUDED_CACHE_H
#include "client.h"
#define HELP_MAX 100 #define HELP_MAX 100
#define CACHELINELEN 81 #define CACHELINELEN 81
#define CACHEFILELEN 30 #define CACHEFILELEN 30
/* two servernames, a gecos, three spaces, ":1", '\0' */
#define LINKSLINELEN (HOSTLEN + HOSTLEN + REALLEN + 6)
#define HELP_USER 0x001 #define HELP_USER 0x001
#define HELP_OPER 0x002 #define HELP_OPER 0x002
@ -32,19 +32,20 @@ extern struct cachefile *oper_motd;
extern struct cacheline *emptyline; extern struct cacheline *emptyline;
extern char user_motd_changed[MAX_DATE_STRING]; extern char user_motd_changed[MAX_DATE_STRING];
extern rb_dlink_list links_cache_list;
extern void init_cache(void); void init_cache(void);
extern struct cachefile *cache_file(const char *, const char *, int); struct cachefile *cache_file(const char *, const char *, int);
extern void free_cachefile(struct cachefile *); void cache_links(void *unused);
void free_cachefile(struct cachefile *);
extern void load_help(void); void load_help(void);
extern void send_user_motd(struct Client *); void send_user_motd(struct Client *);
extern void send_oper_motd(struct Client *); void cache_user_motd(void);
struct Dictionary; struct Dictionary;
extern struct Dictionary *help_dict_oper; extern struct Dictionary *help_dict_oper;
extern struct Dictionary *help_dict_user; extern struct Dictionary *help_dict_user;
#endif #endif

145
src/cache.c
View file

@ -29,25 +29,25 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: cache.c 3436 2007-05-02 19:56:40Z jilles $ * $Id: cache.c 25119 2008-03-13 16:57:05Z androsyn $
*/ */
#include "stdinc.h" #include "stdinc.h"
#include "ircd_defs.h" #include "ratbox_lib.h"
#include "common.h" #include "struct.h"
#include "s_conf.h" #include "s_conf.h"
#include "client.h" #include "client.h"
#include "hash.h" #include "hash.h"
#include "cache.h" #include "cache.h"
#include "sprintf_irc.h" #include "match.h"
#include "irc_dictionary.h" #include "ircd.h"
#include "numeric.h" #include "numeric.h"
#include "send.h"
static BlockHeap *cachefile_heap = NULL;
static BlockHeap *cacheline_heap = NULL;
struct cachefile *user_motd = NULL; struct cachefile *user_motd = NULL;
struct cachefile *oper_motd = NULL; struct cachefile *oper_motd = NULL;
struct cacheline *emptyline = NULL;
rb_dlink_list links_cache_list;
char user_motd_changed[MAX_DATE_STRING]; char user_motd_changed[MAX_DATE_STRING];
struct Dictionary *help_dict_oper = NULL; struct Dictionary *help_dict_oper = NULL;
@ -62,13 +62,15 @@ struct Dictionary *help_dict_user = NULL;
void void
init_cache(void) init_cache(void)
{ {
cachefile_heap = BlockHeapCreate(sizeof(struct cachefile), CACHEFILE_HEAP_SIZE); /* allocate the emptyline */
cacheline_heap = BlockHeapCreate(sizeof(struct cacheline), CACHELINE_HEAP_SIZE); emptyline = rb_malloc(sizeof(struct cacheline));
emptyline->data[0] = ' ';
emptyline->data[1] = '\0';
user_motd_changed[0] = '\0'; user_motd_changed[0] = '\0';
user_motd = cache_file(MPATH, "ircd.motd", 0); user_motd = cache_file(MPATH, "ircd.motd", 0);
oper_motd = cache_file(OPATH, "opers.motd", 0); oper_motd = cache_file(OPATH, "opers.motd", 0);
memset(&links_cache_list, 0, sizeof(links_cache_list));
help_dict_oper = irc_dictionary_create(strcasecmp); help_dict_oper = irc_dictionary_create(strcasecmp);
help_dict_user = irc_dictionary_create(strcasecmp); help_dict_user = irc_dictionary_create(strcasecmp);
@ -92,47 +94,69 @@ cache_file(const char *filename, const char *shortname, int flags)
if((in = fopen(filename, "r")) == NULL) if((in = fopen(filename, "r")) == NULL)
return NULL; return NULL;
if(strcmp(shortname, "ircd.motd") == 0)
{
struct stat sb;
struct tm *local_tm;
if(fstat(fileno(in), &sb) < 0) cacheptr = rb_malloc(sizeof(struct cachefile));
return NULL;
local_tm = localtime(&sb.st_mtime); rb_strlcpy(cacheptr->name, shortname, sizeof(cacheptr->name));
if(local_tm != NULL)
rb_snprintf(user_motd_changed, sizeof(user_motd_changed),
"%d/%d/%d %d:%d",
local_tm->tm_mday, local_tm->tm_mon + 1,
1900 + local_tm->tm_year, local_tm->tm_hour,
local_tm->tm_min);
}
cacheptr = BlockHeapAlloc(cachefile_heap);
strlcpy(cacheptr->name, shortname, sizeof(cacheptr->name));
cacheptr->flags = flags; cacheptr->flags = flags;
/* cache the file... */ /* cache the file... */
while(fgets(line, sizeof(line), in) != NULL) while(fgets(line, sizeof(line), in) != NULL)
{ {
if((p = strchr(line, '\n')) != NULL) if((p = strpbrk(line, "\r\n")) != NULL)
*p = '\0'; *p = '\0';
lineptr = BlockHeapAlloc(cacheline_heap); if(!EmptyString(line))
if(EmptyString(line)) {
strlcpy(lineptr->data, " ", sizeof(lineptr->data)); lineptr = rb_malloc(sizeof(struct cacheline));
else rb_strlcpy(lineptr->data, line, sizeof(lineptr->data));
strlcpy(lineptr->data, line, sizeof(lineptr->data));
rb_dlinkAddTail(lineptr, &lineptr->linenode, &cacheptr->contents); rb_dlinkAddTail(lineptr, &lineptr->linenode, &cacheptr->contents);
} }
else
rb_dlinkAddTailAlloc(emptyline, &cacheptr->contents);
}
fclose(in); fclose(in);
return cacheptr; return cacheptr;
} }
void
cache_links(void *unused)
{
struct Client *target_p;
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
char *links_line;
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, links_cache_list.head)
{
rb_free(ptr->data);
rb_free_rb_dlink_node(ptr);
}
links_cache_list.head = links_cache_list.tail = NULL;
links_cache_list.length = 0;
RB_DLINK_FOREACH(ptr, global_serv_list.head)
{
target_p = ptr->data;
/* skip ourselves (done in /links) and hidden servers */
if(IsMe(target_p) ||
(IsHidden(target_p) && !ConfigServerHide.disable_hidden))
continue;
/* if the below is ever modified, change LINKSLINELEN */
links_line = rb_malloc(LINKSLINELEN);
rb_snprintf(links_line, LINKSLINELEN, "%s %s :1 %s",
target_p->name, me.name,
target_p->info[0] ? target_p->info :
"(Unknown Location)");
rb_dlinkAddTailAlloc(links_line, &links_cache_list);
}
}
/* free_cachefile() /* free_cachefile()
* *
* inputs - cachefile to free * inputs - cachefile to free
@ -150,10 +174,11 @@ free_cachefile(struct cachefile *cacheptr)
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, cacheptr->contents.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, cacheptr->contents.head)
{ {
BlockHeapFree(cacheline_heap, ptr->data); if(ptr->data != emptyline)
rb_free(ptr->data);
} }
BlockHeapFree(cachefile_heap, cacheptr); rb_free(cacheptr);
} }
/* load_help() /* load_help()
@ -225,13 +250,12 @@ send_user_motd(struct Client *source_p)
rb_dlink_node *ptr; rb_dlink_node *ptr;
const char *myname = get_id(&me, source_p); const char *myname = get_id(&me, source_p);
const char *nick = get_id(source_p, source_p); const char *nick = get_id(source_p, source_p);
if(user_motd == NULL || rb_dlink_list_length(&user_motd->contents) == 0) if(user_motd == NULL || rb_dlink_list_length(&user_motd->contents) == 0)
{ {
sendto_one(source_p, form_str(ERR_NOMOTD), myname, nick); sendto_one(source_p, form_str(ERR_NOMOTD), myname, nick);
return; return;
} }
SetCork(source_p);
sendto_one(source_p, form_str(RPL_MOTDSTART), myname, nick, me.name); sendto_one(source_p, form_str(RPL_MOTDSTART), myname, nick, me.name);
RB_DLINK_FOREACH(ptr, user_motd->contents.head) RB_DLINK_FOREACH(ptr, user_motd->contents.head)
@ -239,36 +263,29 @@ send_user_motd(struct Client *source_p)
lineptr = ptr->data; lineptr = ptr->data;
sendto_one(source_p, form_str(RPL_MOTD), myname, nick, lineptr->data); sendto_one(source_p, form_str(RPL_MOTD), myname, nick, lineptr->data);
} }
ClearCork(source_p);
sendto_one(source_p, form_str(RPL_ENDOFMOTD), myname, nick); sendto_one(source_p, form_str(RPL_ENDOFMOTD), myname, nick);
} }
/* send_oper_motd()
*
* inputs - client to send motd to
* outputs - client is sent oper motd if exists
* side effects -
*/
void void
send_oper_motd(struct Client *source_p) cache_user_motd(void)
{ {
struct cacheline *lineptr; struct stat sb;
rb_dlink_node *ptr; struct tm *local_tm;
if(oper_motd == NULL || rb_dlink_list_length(&oper_motd->contents) == 0) if(stat(MPATH, &sb) == 0)
return;
sendto_one(source_p, form_str(RPL_OMOTDSTART),
me.name, source_p->name);
RB_DLINK_FOREACH(ptr, oper_motd->contents.head)
{ {
lineptr = ptr->data; local_tm = localtime(&sb.st_mtime);
sendto_one(source_p, form_str(RPL_OMOTD),
me.name, source_p->name, lineptr->data);
}
sendto_one(source_p, form_str(RPL_ENDOFOMOTD), if(local_tm != NULL)
me.name, source_p->name); {
rb_snprintf(user_motd_changed, sizeof(user_motd_changed),
"%d/%d/%d %d:%d",
local_tm->tm_mday, local_tm->tm_mon + 1,
1900 + local_tm->tm_year, local_tm->tm_hour,
local_tm->tm_min);
}
}
free_cachefile(user_motd);
user_motd = cache_file(MPATH, "ircd.motd", 0);
} }