* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cache.c 254 2005-09-21 23:35:12Z nenolod $
+ * $Id: cache.c 3436 2007-05-02 19:56:40Z jilles $
*/
#include "stdinc.h"
#include "ircd_defs.h"
#include "common.h"
#include "s_conf.h"
-#include "tools.h"
#include "client.h"
-#include "memory.h"
-#include "balloc.h"
-#include "event.h"
#include "hash.h"
#include "cache.h"
#include "sprintf_irc.h"
+#include "irc_dictionary.h"
+#include "numeric.h"
static BlockHeap *cachefile_heap = NULL;
static BlockHeap *cacheline_heap = NULL;
struct cachefile *user_motd = NULL;
struct cachefile *oper_motd = NULL;
-struct cacheline *emptyline = NULL;
-dlink_list links_cache_list;
char user_motd_changed[MAX_DATE_STRING];
+struct Dictionary *help_dict_oper = NULL;
+struct Dictionary *help_dict_user = NULL;
+
/* init_cache()
*
* inputs -
cachefile_heap = BlockHeapCreate(sizeof(struct cachefile), CACHEFILE_HEAP_SIZE);
cacheline_heap = BlockHeapCreate(sizeof(struct cacheline), CACHELINE_HEAP_SIZE);
- /* allocate the emptyline */
- emptyline = BlockHeapAlloc(cacheline_heap);
- emptyline->data[0] = ' ';
- emptyline->data[1] = '\0';
user_motd_changed[0] = '\0';
user_motd = cache_file(MPATH, "ircd.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_user = irc_dictionary_create(strcasecmp);
}
/* cache_file()
local_tm = localtime(&sb.st_mtime);
if(local_tm != NULL)
- ircsnprintf(user_motd_changed, sizeof(user_motd_changed),
+ 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,
if((p = strchr(line, '\n')) != NULL)
*p = '\0';
- if(!EmptyString(line))
- {
- lineptr = BlockHeapAlloc(cacheline_heap);
- strlcpy(lineptr->data, line, sizeof(lineptr->data));
- dlinkAddTail(lineptr, &lineptr->linenode, &cacheptr->contents);
- }
+ lineptr = BlockHeapAlloc(cacheline_heap);
+ if(EmptyString(line))
+ strlcpy(lineptr->data, " ", sizeof(lineptr->data));
else
- dlinkAddTailAlloc(emptyline, &cacheptr->contents);
+ strlcpy(lineptr->data, line, sizeof(lineptr->data));
+ rb_dlinkAddTail(lineptr, &lineptr->linenode, &cacheptr->contents);
}
fclose(in);
return cacheptr;
}
-void
-cache_links(void *unused)
-{
- struct Client *target_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
- char *links_line;
-
- DLINK_FOREACH_SAFE(ptr, next_ptr, links_cache_list.head)
- {
- MyFree(ptr->data);
- free_dlink_node(ptr);
- }
-
- links_cache_list.head = links_cache_list.tail = NULL;
- links_cache_list.length = 0;
-
- 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 = MyMalloc(LINKSLINELEN);
- ircsnprintf(links_line, LINKSLINELEN, "%s %s :1 %s",
- target_p->name, me.name,
- target_p->info[0] ? target_p->info :
- "(Unknown Location)");
-
- dlinkAddTailAlloc(links_line, &links_cache_list);
- }
-}
-
/* free_cachefile()
*
* inputs - cachefile to free
void
free_cachefile(struct cachefile *cacheptr)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
if(cacheptr == NULL)
return;
- DLINK_FOREACH_SAFE(ptr, next_ptr, cacheptr->contents.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, cacheptr->contents.head)
{
- if(ptr->data != emptyline)
- BlockHeapFree(cacheline_heap, ptr->data);
+ BlockHeapFree(cacheline_heap, ptr->data);
}
BlockHeapFree(cachefile_heap, cacheptr);
*
* inputs -
* outputs -
- * side effects - contents of help directories are loaded.
+ * side effects - old help cache deleted
+ * - contents of help directories are loaded.
*/
void
load_help(void)
struct dirent *ldirent= NULL;
char filename[MAXPATHLEN];
struct cachefile *cacheptr;
+ struct DictionaryIter iter;
-#if defined(S_ISLNK) && defined(HAVE_LSTAT)
- struct stat sb;
-#endif
+ DICTIONARY_FOREACH(cacheptr, &iter, help_dict_oper)
+ {
+ irc_dictionary_delete(help_dict_oper, cacheptr->name);
+ free_cachefile(cacheptr);
+ }
+ DICTIONARY_FOREACH(cacheptr, &iter, help_dict_user)
+ {
+ irc_dictionary_delete(help_dict_user, cacheptr->name);
+ free_cachefile(cacheptr);
+ }
- /* opers must be done first */
helpfile_dir = opendir(HPATH);
if(helpfile_dir == NULL)
while((ldirent = readdir(helpfile_dir)) != NULL)
{
- ircsnprintf(filename, sizeof(filename), "%s/%s", HPATH, ldirent->d_name);
+ rb_snprintf(filename, sizeof(filename), "%s/%s", HPATH, ldirent->d_name);
cacheptr = cache_file(filename, ldirent->d_name, HELP_OPER);
- add_to_help_hash(cacheptr->name, cacheptr);
+ irc_dictionary_add(help_dict_oper, cacheptr->name, cacheptr);
}
closedir(helpfile_dir);
while((ldirent = readdir(helpfile_dir)) != NULL)
{
- ircsnprintf(filename, sizeof(filename), "%s/%s", UHPATH, ldirent->d_name);
-
-#if defined(S_ISLNK) && defined(HAVE_LSTAT)
- if(lstat(filename, &sb) < 0)
- continue;
-
- /* ok, if its a symlink, we work on the presumption if an
- * oper help exists of that name, its a symlink to that --fl
- */
- if(S_ISLNK(sb.st_mode))
- {
- cacheptr = hash_find_help(ldirent->d_name, HELP_OPER);
-
- if(cacheptr != NULL)
- {
- cacheptr->flags |= HELP_USER;
- continue;
- }
- }
-#endif
+ rb_snprintf(filename, sizeof(filename), "%s/%s", UHPATH, ldirent->d_name);
cacheptr = cache_file(filename, ldirent->d_name, HELP_USER);
- add_to_help_hash(cacheptr->name, cacheptr);
+ irc_dictionary_add(help_dict_user, cacheptr->name, cacheptr);
}
closedir(helpfile_dir);
send_user_motd(struct Client *source_p)
{
struct cacheline *lineptr;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
const char *myname = get_id(&me, source_p);
const char *nick = get_id(source_p, source_p);
- if(user_motd == NULL || 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);
return;
sendto_one(source_p, form_str(RPL_MOTDSTART), myname, nick, me.name);
- DLINK_FOREACH(ptr, user_motd->contents.head)
+ RB_DLINK_FOREACH(ptr, user_motd->contents.head)
{
lineptr = ptr->data;
sendto_one(source_p, form_str(RPL_MOTD), myname, nick, lineptr->data);
send_oper_motd(struct Client *source_p)
{
struct cacheline *lineptr;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
- if(oper_motd == NULL || dlink_list_length(&oper_motd->contents) == 0)
+ if(oper_motd == NULL || rb_dlink_list_length(&oper_motd->contents) == 0)
return;
sendto_one(source_p, form_str(RPL_OMOTDSTART),
me.name, source_p->name);
- DLINK_FOREACH(ptr, oper_motd->contents.head)
+ RB_DLINK_FOREACH(ptr, oper_motd->contents.head)
{
lineptr = ptr->data;
sendto_one(source_p, form_str(RPL_OMOTD),
projects / irc / rqf / shadowircd.git / blobdiff