ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/user.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/user.c (file contents):
Revision 5301 by michael, Sun Jan 4 16:58:27 2015 UTC vs.
Revision 5590 by michael, Tue Feb 17 17:55:01 2015 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (c) 1997-2014 ircd-hybrid development team
4 > *  Copyright (c) 1997-2015 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 19 | Line 19
19   *  USA
20   */
21  
22 < /*! \file s_user.c
22 > /*! \file user.c
23   * \brief User related functions.
24   * \version $Id$
25   */
# Line 65 | Line 65 | struct Isupport
65   static dlink_list support_list;
66   static dlink_list support_list_lines;
67  
68 < /* memory is cheap. map 0-255 to equivalent mode */
69 < const unsigned int user_modes[256] =
68 > const struct user_modes *umode_map[256];
69 > const struct user_modes  umode_tab[] =
70   {
71 <  /* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72 <  /* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73 <  /* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74 <  /* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75 <  0,                  /* @ */
76 <  0,                  /* A */
77 <  0,                  /* B */
78 <  0,                  /* C */
79 <  UMODE_DEAF,         /* D */
80 <  0,                  /* E */
81 <  UMODE_FARCONNECT,   /* F */
82 <  UMODE_SOFTCALLERID, /* G */
83 <  UMODE_HIDDEN,       /* H */
84 <  0,                  /* I */
85 <  0,                  /* J */
86 <  0,                  /* K */
87 <  0,                  /* L */
88 <  0,                  /* M */
89 <  0,                  /* N */
90 <  0,                  /* O */
91 <  0,                  /* P */
92 <  0,                  /* Q */
93 <  UMODE_REGONLY,      /* R */
94 <  UMODE_SSL,          /* S */
95 <  0,                  /* T */
96 <  0,                  /* U */
97 <  0,                  /* V */
98 <  UMODE_WEBIRC,       /* W */
99 <  0,                  /* X */
100 <  0,                  /* Y */
101 <  0,                  /* Z 0x5A */
102 <  0, 0, 0, 0, 0,      /* 0x5F   */
103 <  0,                  /* 0x60   */
104 <  UMODE_ADMIN,        /* a */
105 <  UMODE_BOTS,         /* b */
106 <  UMODE_CCONN,        /* c */
107 <  UMODE_DEBUG,        /* d */
108 <  UMODE_EXTERNAL,     /* e */
109 <  UMODE_FULL,         /* f */
110 <  UMODE_CALLERID,     /* g */
111 <  0,                  /* h */
112 <  UMODE_INVISIBLE,    /* i */
113 <  UMODE_REJ,          /* j */
114 <  UMODE_SKILL,        /* k */
115 <  UMODE_LOCOPS,       /* l */
116 <  0,                  /* m */
117 <  UMODE_NCHANGE,      /* n */
118 <  UMODE_OPER,         /* o */
119 <  UMODE_HIDECHANS,    /* p */
120 <  UMODE_HIDEIDLE,     /* q */
121 <  UMODE_REGISTERED,   /* r */
122 <  UMODE_SERVNOTICE,   /* s */
123 <  0,                  /* t */
124 <  UMODE_UNAUTH,       /* u */
125 <  0,                  /* v */
126 <  UMODE_WALLOP,       /* w */
127 <  UMODE_HIDDENHOST,   /* x */
128 <  UMODE_SPY,          /* y */
129 <  0,                  /* z      0x7A */
130 <  0,0,0,0,0,          /* 0x7B - 0x7F */
131 <
132 <  /* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
133 <  /* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
134 <  /* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
135 <  /* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
136 <  /* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
137 <  /* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
138 <  /* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
139 <  /* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
71 >  { 'D', UMODE_DEAF         },
72 >  { 'F', UMODE_FARCONNECT   },
73 >  { 'G', UMODE_SOFTCALLERID },
74 >  { 'H', UMODE_HIDDEN       },
75 >  { 'R', UMODE_REGONLY      },
76 >  { 'S', UMODE_SSL          },
77 >  { 'W', UMODE_WEBIRC       },
78 >  { 'a', UMODE_ADMIN        },
79 >  { 'b', UMODE_BOTS         },
80 >  { 'c', UMODE_CCONN        },
81 >  { 'd', UMODE_DEBUG        },
82 >  { 'e', UMODE_EXTERNAL     },
83 >  { 'f', UMODE_FULL         },
84 >  { 'g', UMODE_CALLERID     },
85 >  { 'i', UMODE_INVISIBLE    },
86 >  { 'j', UMODE_REJ          },
87 >  { 'k', UMODE_SKILL        },
88 >  { 'l', UMODE_LOCOPS       },
89 >  { 'n', UMODE_NCHANGE      },
90 >  { 'o', UMODE_OPER         },
91 >  { 'p', UMODE_HIDECHANS    },
92 >  { 'q', UMODE_HIDEIDLE     },
93 >  { 'r', UMODE_REGISTERED   },
94 >  { 's', UMODE_SERVNOTICE   },
95 >  { 'u', UMODE_UNAUTH       },
96 >  { 'w', UMODE_WALLOP       },
97 >  { 'x', UMODE_HIDDENHOST   },
98 >  { 'y', UMODE_SPY          },
99 >  { '\0', 0 }
100   };
101  
102   void
103 < assemble_umode_buffer(void)
103 > user_usermodes_init(void)
104   {
145 –  unsigned int idx = 0;
105    char *umode_buffer_ptr = umode_buffer;
106  
107 <  for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
108 <    if (user_modes[idx])
109 <      *umode_buffer_ptr++ = idx;
107 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108 >  {
109 >    umode_map[tab->c] = tab;
110 >    *umode_buffer_ptr++ = tab->c;
111 >  }
112  
113    *umode_buffer_ptr = '\0';
114   }
# Line 404 | Line 365 | register_local_user(struct Client *sourc
365  
366    assert(source_p == source_p->from);
367    assert(MyConnect(source_p));
368 +  assert(IsUnknown(source_p));
369    assert(!source_p->connection->registration);
370  
409 –  ClearCap(source_p, CAP_TS6);
410 –
371    if (ConfigGeneral.ping_cookie)
372    {
373      if (!IsPingSent(source_p) && !source_p->connection->random_ping)
# Line 502 | Line 462 | register_local_user(struct Client *sourc
462     * probably be just a percentage of the MAXCLIENTS...
463     *   -Taner
464     */
465 <  if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
466 <      (Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
465 >  if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
466 >      (Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
467    {
468      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
469                           "Too many clients, rejecting %s[%s].",
# Line 628 | Line 588 | register_remote_user(struct Client *sour
588    SetUserHost(source_p);
589  
590    if (HasFlag(source_p->servptr, FLAGS_EOB))
591 +  {
592      if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
593        sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
594                             "Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
# Line 640 | Line 601 | register_remote_user(struct Client *sour
601                             source_p->servptr->name,
602                             source_p->name, source_p->username, source_p->host,
603                             source_p->info, source_p->id);
604 +  }
605  
606    introduce_client(source_p);
607   }
# Line 774 | Line 736 | send_umode(struct Client *client_p, stru
736     * Build a string in umode_buf to represent the change in the user's
737     * mode between the new (source_p->umodes) and 'old'.
738     */
739 <  for (unsigned int i = 0; i < 128; ++i)
739 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
740    {
741 <    unsigned int flag = user_modes[i];
780 <
781 <    if (!flag)
782 <      continue;
783 <
784 <    if ((flag & old) && !HasUMode(source_p, flag))
741 >    if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
742      {
743        if (what == MODE_DEL)
744 <        *m++ = (char)i;
744 >        *m++ = tab->c;
745        else
746        {
747          what = MODE_DEL;
748          *m++ = '-';
749 <        *m++ = (char)i;
749 >        *m++ = tab->c;
750        }
751      }
752 <    else if (!(flag & old) && HasUMode(source_p, flag))
752 >    else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
753      {
754        if (what == MODE_ADD)
755 <        *m++ = (char)i;
755 >        *m++ = tab->c;
756        else
757        {
758          what = MODE_ADD;
759          *m++ = '+';
760 <        *m++ = (char)i;
760 >        *m++ = tab->c;
761        }
762      }
763    }
# Line 955 | Line 912 | oper_up(struct Client *source_p)
912    if (HasOFlag(source_p, OPER_FLAG_ADMIN))
913      AddUMode(source_p, UMODE_ADMIN);
914  
915 +  if (!EmptyString(conf->whois))
916 +  {
917 +    client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
918 +    sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
919 +                  me.id, source_p->id, (unsigned long)source_p->tsinfo,
920 +                  RPL_WHOISOPERATOR, conf->whois);
921 +  }
922 +
923    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
924                         get_oper_name(source_p));
925    sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)