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-8/src/s_user.c (file contents):
Revision 1169 by michael, Fri Aug 12 18:45:03 2011 UTC vs.
Revision 1294 by michael, Wed Feb 22 20:48:30 2012 UTC

# Line 29 | Line 29
29   #include "channel.h"
30   #include "channel_mode.h"
31   #include "client.h"
32 – #include "common.h"
32   #include "fdlist.h"
33   #include "hash.h"
34   #include "irc_string.h"
# Line 51 | Line 50
50   #include "userhost.h"
51   #include "hook.h"
52   #include "s_misc.h"
53 < #include "msg.h"
53 > #include "parse.h"
54   #include "watch.h"
55  
56  
# Line 96 | Line 95 | unsigned int user_modes[256] =
95    0,                  /* E */
96    0,                  /* F */
97    UMODE_SOFTCALLERID, /* G */
98 <  0,                  /* H */
98 >  UMODE_HIDDEN,       /* H */
99    0,                  /* I */
100    0,                  /* J */
101    0,                  /* K */
# Line 106 | Line 105 | unsigned int user_modes[256] =
105    0,                  /* O */
106    0,                  /* P */
107    0,                  /* Q */
108 <  0,                  /* R */
108 >  UMODE_REGONLY,      /* R */
109    0,                  /* S */
110    0,                  /* T */
111    0,                  /* U */
# Line 190 | Line 189 | show_lusers(struct Client *source_p)
189      to = source_p->name;
190    }
191  
192 <  if (!ConfigServerHide.hide_servers || IsOper(source_p))
192 >  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
193      sendto_one(source_p, form_str(RPL_LUSERCLIENT),
194                 from, to, (Count.total-Count.invisi),
195                 Count.invisi, dlink_list_length(&global_serv_list));
# Line 210 | Line 209 | show_lusers(struct Client *source_p)
209      sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
210                 from, to, dlink_list_length(&global_channel_list));
211  
212 <  if (!ConfigServerHide.hide_servers || IsOper(source_p))
212 >  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
213    {
214      sendto_one(source_p, form_str(RPL_LUSERME),
215                 from, to, Count.local, Count.myserver);
# Line 231 | Line 230 | show_lusers(struct Client *source_p)
230               from, to, Count.total, Count.max_tot,
231               Count.total, Count.max_tot);
232  
233 <  if (!ConfigServerHide.hide_servers || IsOper(source_p))
233 >  if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
234      sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
235                 Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
236  
# Line 309 | Line 308 | register_local_user(struct Client *sourc
308        return;
309    }
310  
311 <  source_p->localClient->last = CurrentTime;
311 >  source_p->localClient->last_privmsg = CurrentTime;
312    /* Straight up the maximum rate of flooding... */
313    source_p->localClient->allow_read = MAX_FLOOD_BURST;
314  
# Line 445 | Line 444 | register_local_user(struct Client *sourc
444  
445    if (ConfigFileEntry.invisible_on_connect)
446    {
447 <    source_p->umodes |= UMODE_INVISIBLE;
447 >    AddUMode(source_p, UMODE_INVISIBLE);
448      ++Count.invisi;
449    }
450  
# Line 522 | Line 521 | register_remote_user(struct Client *sour
521                           source_p->host, source_p->from->name);
522      kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
523  
524 <    SetKilled(source_p);
524 >    AddFlag(source_p, FLAGS_KILLED);
525      exit_client(source_p, &me, "Ghosted Client");
526      return;
527    }
# Line 537 | Line 536 | register_remote_user(struct Client *sour
536      kill_client(source_p->from, source_p,
537                  "%s (NICK from wrong direction (%s != %s))",
538                  me.name, source_p->servptr->name, target_p->from->name);
539 <    SetKilled(source_p);
539 >    AddFlag(source_p, FLAGS_KILLED);
540      exit_client(source_p, &me, "USER server wrong direction");
541      return;
542    }
# Line 546 | Line 545 | register_remote_user(struct Client *sour
545     * If the nick has been introduced by a services server,
546     * make it a service as well.
547     */
548 <  if (IsService(source_p->servptr))
549 <    SetService(source_p);
548 >  if (HasFlag(source_p->servptr, FLAGS_SERVICE))
549 >    AddFlag(source_p, FLAGS_SERVICE);
550  
551    /* Increment our total user count here */
552    if (++Count.total > Count.max_tot)
# Line 595 | Line 594 | introduce_client(struct Client *source_p
594      if (server == source_p->from)
595          continue;
596  
597 <    if (IsCapable(server, CAP_TS6) && HasID(source_p))
598 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
599 <                 source_p->servptr->id,
600 <                 source_p->name, source_p->hopcount+1,
601 <                 (unsigned long)source_p->tsinfo,
602 <                 ubuf, source_p->username, source_p->host,
603 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
604 <                 "0" : source_p->sockhost, source_p->id, source_p->info);
597 >    if (IsCapable(server, CAP_SVS))
598 >    {
599 >      if (IsCapable(server, CAP_TS6) && HasID(source_p))
600 >        sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
601 >                   source_p->servptr->id,
602 >                   source_p->name, source_p->hopcount+1,
603 >                   (unsigned long)source_p->tsinfo,
604 >                   ubuf, source_p->username, source_p->host,
605 >                   (MyClient(source_p) && IsIPSpoof(source_p)) ?
606 >                   "0" : source_p->sockhost, source_p->id,
607 >                   (unsigned long)source_p->servicestamp,
608 >                   source_p->info);
609 >      else
610 >        sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
611 >                   source_p->name, source_p->hopcount+1,
612 >                   (unsigned long)source_p->tsinfo,
613 >                   ubuf, source_p->username, source_p->host,
614 >                   source_p->servptr->name, (unsigned long)source_p->servicestamp,
615 >                   source_p->info);
616 >
617 >    }
618      else
619 <      sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
620 <                 source_p->name, source_p->hopcount+1,
621 <                 (unsigned long)source_p->tsinfo,
622 <                 ubuf, source_p->username, source_p->host,
623 <                 source_p->servptr->name, source_p->info);
619 >    {
620 >      if (IsCapable(server, CAP_TS6) && HasID(source_p))
621 >        sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
622 >                   source_p->servptr->id,
623 >                   source_p->name, source_p->hopcount+1,
624 >                   (unsigned long)source_p->tsinfo,
625 >                   ubuf, source_p->username, source_p->host,
626 >                   (MyClient(source_p) && IsIPSpoof(source_p)) ?
627 >                   "0" : source_p->sockhost, source_p->id, source_p->info);
628 >      else
629 >        sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630 >                   source_p->name, source_p->hopcount+1,
631 >                   (unsigned long)source_p->tsinfo,
632 >                   ubuf, source_p->username, source_p->host,
633 >                   source_p->servptr->name, source_p->info);
634 >    }
635    }
636   }
637  
# Line 762 | Line 785 | report_and_set_user_flags(struct Client
785                 me.name,source_p->name);
786    }
787  
765 –  /* If this user is exempt from idle time outs */
766 –  if (IsConfIdlelined(aconf))
767 –  {
768 –    SetIdlelined(source_p);
769 –    sendto_one(source_p,
770 –               ":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
771 –               me.name, source_p->name);
772 –  }
773 –
788    if (IsConfCanFlood(aconf))
789    {
790      SetCanFlood(source_p);
# Line 799 | Line 813 | change_simple_umode(va_list args)
813    flag = va_arg(args, unsigned int);
814  
815    if (what == MODE_ADD)
816 <    source_p->umodes |= flag;
816 >    AddUMode(source_p, flag);
817    else
818 <    source_p->umodes &= ~flag;
818 >    DelUMode(source_p, flag);
819  
820    return NULL;
821   }
# Line 852 | Line 866 | set_user_mode(struct Client *client_p, s
866      *m++ = '+';
867  
868      for (i = 0; i < 128; i++)
869 <      if (source_p->umodes & user_modes[i])
869 >      if (HasUMode(source_p, user_modes[i]))
870          *m++ = (char)i;
871      *m = '\0';
872  
# Line 882 | Line 896 | set_user_mode(struct Client *client_p, s
896          case 'o':
897            if (what == MODE_ADD)
898            {
899 <            if (IsServer(client_p) && !IsOper(source_p))
899 >            if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
900              {
901                ++Count.oper;
902                SetOper(source_p);
# Line 893 | Line 907 | set_user_mode(struct Client *client_p, s
907              /* Only decrement the oper counts if an oper to begin with
908               * found by Pat Szuta, Perly , perly@xnet.com
909               */
910 <            if (!IsOper(source_p))
910 >            if (!HasUMode(source_p, UMODE_OPER))
911                break;
912  
913              ClearOper(source_p);
# Line 904 | Line 918 | set_user_mode(struct Client *client_p, s
918                dlink_node *dm;
919  
920                detach_conf(source_p, OPER_TYPE);
921 <              ClearOperFlags(source_p);
922 <              source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
921 >              ClrOFlag(source_p);
922 >              DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
923  
924                if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
925                  free_dlink_node(dm);
# Line 927 | Line 941 | set_user_mode(struct Client *client_p, s
941          default:
942            if ((flag = user_modes[(unsigned char)*m]))
943            {
944 <            if (MyConnect(source_p) && !IsOper(source_p) &&
944 >            if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
945                  (ConfigFileEntry.oper_only_umodes & flag))
946              {
947                badflag = 1;
# Line 950 | Line 964 | set_user_mode(struct Client *client_p, s
964      sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
965                 me.name, source_p->name);
966  
967 <  if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
967 >  if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
968    {
969 <    sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
969 >    sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
970                 me.name, source_p->name);
971 <    DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
971 >    DelUMode(source_p, UMODE_NCHANGE);
972    }
973  
974 <  if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
975 <      !IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
974 >  if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
975 >      !HasOFlag(source_p, OPER_FLAG_ADMIN))
976    {
977      sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
978                 me.name, source_p->name);
979 <    source_p->umodes &= ~UMODE_ADMIN;
979 >    DelUMode(source_p, UMODE_ADMIN);
980    }
981  
982 <  if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
982 >  if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
983      ++Count.invisi;
984 <  if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
984 >  if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
985      --Count.invisi;
986  
987    /*
# Line 1010 | Line 1024 | send_umode(struct Client *client_p, stru
1024      if (MyClient(source_p) && !(flag & sendmask))
1025        continue;
1026  
1027 <    if ((flag & old) && !(source_p->umodes & flag))
1027 >    if ((flag & old) && !HasUMode(source_p, flag))
1028      {
1029        if (what == MODE_DEL)
1030          *m++ = (char)i;
# Line 1021 | Line 1035 | send_umode(struct Client *client_p, stru
1035          *m++ = (char)i;
1036        }
1037      }
1038 <    else if (!(flag & old) && (source_p->umodes & flag))
1038 >    else if (!(flag & old) && HasUMode(source_p, flag))
1039      {
1040        if (what == MODE_ADD)
1041          *m++ = (char)i;
# Line 1055 | Line 1069 | send_umode_out(struct Client *client_p,
1069    char buf[IRCD_BUFSIZE] = { '\0' };
1070    dlink_node *ptr = NULL;
1071  
1072 <  send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1059 <             SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1072 >  send_umode(NULL, source_p, old, SEND_UMODES, buf);
1073  
1074    if (buf[0])
1075    {
# Line 1200 | Line 1213 | oper_up(struct Client *source_p)
1213    SetOper(source_p);
1214  
1215    if (oconf->modes)
1216 <    source_p->umodes |= oconf->modes;
1216 >    AddUMode(source_p, oconf->modes);
1217    else if (ConfigFileEntry.oper_umodes)
1218 <    source_p->umodes |= ConfigFileEntry.oper_umodes;
1206 <  else
1207 <    source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1208 <                         UMODE_WALLOP|UMODE_LOCOPS);
1218 >    AddUMode(source_p, ConfigFileEntry.oper_umodes);
1219  
1220 <  if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1220 >  if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1221      ++Count.invisi;
1222 <  if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1222 >  if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1223      --Count.invisi;
1224  
1225    assert(dlinkFind(&oper_list, source_p) == NULL);
# Line 1217 | Line 1227 | oper_up(struct Client *source_p)
1227  
1228    operprivs = oper_privs_as_string(oconf->port);
1229  
1230 <  SetOFlag(source_p, oconf->port);
1230 >  AddOFlag(source_p, oconf->port);
1231  
1232 <  if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1232 >  if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1233      AddUMode(source_p, UMODE_ADMIN);
1234 <  if (!IsOperN(source_p))
1234 >  if (!HasOFlag(source_p, OPER_FLAG_N))
1235      DelUMode(source_p, UMODE_NCHANGE);
1236  
1237    sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",

Diff Legend

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