*** ../ircu2.10.06/include/s_user.h Tue Oct 5 11:12:39 1999 --- ../ircu2.10.06+/include/s_user.h Tue Oct 5 11:13:54 1999 *************** *** 72,82 **** extern void add_target(aClient *sptr, void *target); #if defined(DB_HISPANO) || defined(DB_ESNET) extern unsigned int base64toint(const char *str); #ifdef DBH_VIP extern char *get_virtualhost(aClient *sptr); #endif #endif - extern const char *inttobase64(unsigned int i); extern struct SLink *opsarray[]; --- 72,82 ---- extern void add_target(aClient *sptr, void *target); #if defined(DB_HISPANO) || defined(DB_ESNET) extern unsigned int base64toint(const char *str); + extern const char *inttobase64(unsigned int i); #ifdef DBH_VIP extern char *get_virtualhost(aClient *sptr); #endif #endif extern struct SLink *opsarray[]; *** ../ircu2.10.06/include/struct.h Tue Oct 5 11:18:38 1999 --- ../ircu2.10.06+/include/struct.h Tue Oct 5 11:23:59 1999 *************** *** 137,151 **** struct DSlink *updown; /* own Dlink in up->serv->down struct */ aClient **client_list; /* List with client pointers on this server */ struct User *user; /* who activated this connection */ - char by[NICKLEN + 1]; struct ConfItem *nline; /* N-line pointer for this server */ time_t timestamp; /* Remotely determined connect try time */ time_t ghost; /* Local time at which a new server caused a Ghost */ ! unsigned short int prot; /* Major protocol */ ! unsigned short int nn_mask; /* [Remote] FD_SETSIZE - 1 */ ! unsigned char last_x1; ! unsigned char last_x2; #ifdef DB_ESNET unsigned char esnet_db; #endif --- 137,150 ---- struct DSlink *updown; /* own Dlink in up->serv->down struct */ aClient **client_list; /* List with client pointers on this server */ struct User *user; /* who activated this connection */ struct ConfItem *nline; /* N-line pointer for this server */ time_t timestamp; /* Remotely determined connect try time */ time_t ghost; /* Local time at which a new server caused a Ghost */ ! unsigned short prot; /* Major protocol */ ! unsigned short nn_last; /* Last numeric nick for p9 servers only */ ! unsigned int nn_mask; /* [Remote] FD_SETSIZE - 1 */ ! char nn_capacity[4]; /* numeric representation of server capacity */ #ifdef DB_ESNET unsigned char esnet_db; #endif *************** *** 153,158 **** --- 152,158 ---- struct Client *bcptr; #endif char *last_error_msg; /* Allocated memory with last message receive with an ERROR */ + char by[NICKLEN + 1]; }; struct User { *** ../ircu2.10.06/ircd/s_bsd.c Tue Oct 5 11:26:25 1999 --- ../ircu2.10.06+/ircd/s_bsd.c Tue Oct 5 11:31:12 1999 *************** *** 988,996 **** /* Make us timeout after twice the timeout for DNS look ups */ cptr->lasttime = now; cptr->flags |= FLAGS_PINGSENT; ! sendto_one(cptr, "SERVER %s 1 " TIME_T_FMT " " TIME_T_FMT " J%s %s :%s", my_name_for_link(me.name, aconf), me.serv->timestamp, ! newts, MAJOR_PROTOCOL, me.yxx, me.info); #ifdef DB_ESNET sendto_one(cptr,"%c DB * 0 J %lu",me.yxx[0],tabla_serie[ESNET_NICKDB]); #endif --- 988,996 ---- /* Make us timeout after twice the timeout for DNS look ups */ cptr->lasttime = now; cptr->flags |= FLAGS_PINGSENT; ! sendto_one(cptr, "SERVER %s 1 " TIME_T_FMT " " TIME_T_FMT " J%s %s%s :%s", my_name_for_link(me.name, aconf), me.serv->timestamp, ! newts, MAJOR_PROTOCOL, NumServCap(&me), me.info); #ifdef DB_ESNET sendto_one(cptr,"%c DB * 0 J %lu",me.yxx[0],tabla_serie[ESNET_NICKDB]); #endif *** ../ircu2.10.06/ircd/s_user.c Tue Oct 5 11:34:28 1999 --- ../ircu2.10.06+/ircd/s_user.c Tue Oct 5 11:40:48 1999 *************** *** 753,783 **** /* *INDENT-ON* */ - unsigned int base64toint(const char *str) - { - register unsigned int i; - i = convert2n[(unsigned char)str[5]]; - i += convert2n[(unsigned char)str[4]] << 6; - i += convert2n[(unsigned char)str[3]] << 12; - i += convert2n[(unsigned char)str[2]] << 18; - i += convert2n[(unsigned char)str[1]] << 24; - i += convert2n[(unsigned char)str[0]] << 30; - return i; - } - - const char *inttobase64(unsigned int i) - { - static char base64buf[7]; - base64buf[0] = convert2y[(i >> 30) & 0x3f]; - base64buf[1] = convert2y[(i >> 24) & 0x3f]; - base64buf[2] = convert2y[(i >> 18) & 0x3f]; - base64buf[3] = convert2y[(i >> 12) & 0x3f]; - base64buf[4] = convert2y[(i >> 6) & 0x3f]; - base64buf[5] = convert2y[i & 0x3f]; - /* base64buf[6] = 0; (static is initialized 0) */ - return base64buf; - } - #define COOKIE_VERIFIED ((unsigned int)-1) /* --- 753,758 ---- *************** *** 807,814 **** struct dbh_reg *reg; char hflag='-'; #endif ! aClient *acptr, *server = NULL; ! char nick[NICKLEN + 2], *s; Link *lp; time_t lastnick = (time_t) 0; int differ = 1; --- 782,791 ---- struct dbh_reg *reg; char hflag='-'; #endif ! aClient *acptr; ! aClient *server = NULL; ! char nick[NICKLEN + 2]; ! char *s; Link *lp; time_t lastnick = (time_t) 0; int differ = 1; *** ../ircu2.10.06/include/s_user.h Tue Oct 5 11:45:28 1999 --- ../ircu2.10.06+/include/s_user.h Tue Oct 5 11:46:14 1999 *************** *** 71,78 **** int created); extern void add_target(aClient *sptr, void *target); #if defined(DB_HISPANO) || defined(DB_ESNET) - extern unsigned int base64toint(const char *str); - extern const char *inttobase64(unsigned int i); #ifdef DBH_VIP extern char *get_virtualhost(aClient *sptr); #endif --- 71,76 ---- *** ../ircu2.10.06/ircd/s_user.c Tue Oct 5 11:51:11 1999 --- ../ircu2.10.06+/ircd/s_user.c Tue Oct 5 11:53:54 1999 *************** *** 3385,3393 **** tea(v,k,x); ! strcpy(acptr->user->virtualhost, inttobase64(x[0])); ! strcat(acptr->user->virtualhost, inttobase64(x[1])); ! strcat(acptr->user->virtualhost, ".virtual"); if( strchr(acptr->user->virtualhost, '[') == NULL && strchr(acptr->user->virtualhost, ']') == NULL ) --- 3385,3393 ---- tea(v,k,x); ! inttobase64(acptr->user->virtualhost,x[0],6); ! inttobase64(acptr->user->virtualhost+6,x[1],6); ! strcpy(acptr->user->virtualhost+12,".virtual"); if( strchr(acptr->user->virtualhost, '[') == NULL && strchr(acptr->user->virtualhost, ']') == NULL )