[ViewVC] Diff of: svn/ircd-hybrid/trunk/src/s

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1559 by michael, Sun Oct 14 01:38:28 2012 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1819 by michael, Fri Apr 12 11:57:26 2013 UTC

+#include "fdlist.h"
+#include "hash.h"
+#include "irc_string.h"
-–
+#include "sprintf_irc.h"
+#include "s_bsd.h"
+#include "ircd.h"
+#include "listener.h"
+static char umode_buffer[IRCD_BUFSIZE];
+static void user_welcome(struct Client *);
-<
+static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
->
+static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
+static int check_xline(struct Client *);
+static void introduce_client(struct Client *);
+static const char *uid_get(void);
+  UMODE_BOTS,         /* b */
+  UMODE_CCONN,        /* c */
+  UMODE_DEBUG,        /* d */
-<
+,                  /* e */
->
+  UMODE_EXTERNAL,     /* e */
+  UMODE_FULL,         /* f */
+  UMODE_CALLERID,     /* g */
+,                  /* h */
+  UMODE_UNAUTH,       /* u */
+,                  /* v */
+  UMODE_WALLOP,       /* w */
-<
+  UMODE_EXTERNAL,     /* x */
->
+,                  /* x */
+  UMODE_SPY,          /* y */
+  UMODE_OPERWALL,     /* z      0x7A */
+,0,0,0,0,          /* 0x7B - 0x7F */
+register_local_user(struct Client *source_p)
+  const char *id = NULL;
-<
+  const struct AccessItem *aconf = NULL;
-<
+  dlink_node *ptr = NULL;
->
+  const struct MaskItem *conf = NULL;
+  assert(source_p != NULL);
+  assert(source_p == source_p->from);
+  /* Straight up the maximum rate of flooding... */
+  source_p->localClient->allow_read = MAX_FLOOD_BURST;
-<
+  if (!execute_callback(client_check_cb, source_p, source_p->username))
->
+  if (!check_client(source_p))
+    return;
+  if (valid_hostname(source_p->host) == 0)
+            sizeof(source_p->host));
-<
+  ptr   = source_p->localClient->confs.head;
-<
+  aconf = map_to_conf(ptr->data);
->
+  conf = source_p->localClient->confs.head->data;
+  if (!IsGotId(source_p))
+    const char *p = username;
+    unsigned int i = 0;
-<
+    if (IsNeedIdentd(aconf))
->
+    if (IsNeedIdentd(conf))
+      ++ServerStats.is_ref;
+      sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
+    strlcpy(username, source_p->username, sizeof(username));
-<
+    if (!IsNoTilde(aconf))
->
+    if (!IsNoTilde(conf))
+      source_p->username[i++] = '~';
+    for (; *p && i < USERLEN; ++p)
+  /* password check */
-<
+  if (!EmptyString(aconf->passwd))
->
+  if (!EmptyString(conf->passwd))
+    const char *pass = source_p->localClient->passwd;
-<
+    if (!match_conf_password(pass, aconf))
->
+    if (!match_conf_password(pass, conf))
+      ++ServerStats.is_ref;
+      sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
+   */
+  /* report if user has &^>= etc. and set flags as needed in source_p */
-<
+  report_and_set_user_flags(source_p, aconf);
->
+  report_and_set_user_flags(source_p, conf);
+  if (IsDead(source_p))
+    return;
+  if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
+      (Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
-<
+    sendto_realops_flags(UMODE_FULL, L_ALL,
->
+    sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
+                         "Too many clients, rejecting %s[%s].",
+                         source_p->name, source_p->host);
+    ++ServerStats.is_ref;
+    char tmpstr2[IRCD_BUFSIZE];
-<
+    sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
->
+    sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
->
+                         "Invalid username: %s (%s@%s)",
+                         source_p->name, source_p->username, source_p->host);
+    ++ServerStats.is_ref;
+    snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
+  strlcpy(source_p->id, id, sizeof(source_p->id));
+  hash_add_id(source_p);
-<
+  sendto_realops_flags(UMODE_CCONN, L_ALL,
->
+  sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
+                       "Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
+                       source_p->name, source_p->username, source_p->host,
+                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
+                       "255.255.255.255" : source_p->sockhost,
-<
+                       get_client_class(source_p),
->
+                       get_client_class(&source_p->localClient->confs),
+                       source_p->info, source_p->id);
-<
+  sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
->
+  sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
+                       "CLICONN %s %s %s %s %s %s %s 0 %s",
+                       source_p->name, source_p->username, source_p->host,
+                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
+                       "255.255.255.255" : source_p->sockhost,
-<
+                       get_client_class(source_p),
->
+                       get_client_class(&source_p->localClient->confs),
+                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
+                           "<hidden>" : source_p->localClient->client_host,
+                       ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
+    Count.max_loc = Count.local;
+    if (!(Count.max_loc % 10))
-<
+      sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
->
+      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
->
+                           "New Max Local Clients: %d",
+                           Count.max_loc);
+   */
+  source_p->servptr = hash_find_server(server);
-<
+  /* Super GhostDetect:
->
+  /*
->
+   * Super GhostDetect:
+   * If we can't find the server the user is supposed to be on,
+   * then simply blow the user away.        -Taner
+   */
+  if (source_p->servptr == NULL)
-<
+    sendto_realops_flags(UMODE_ALL, L_ALL,
->
+    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
+                         "No server %s for user %s[%s@%s] from %s",
+                         server, source_p->name, source_p->username,
+                         source_p->host, source_p->from->name);
+  if ((target_p = source_p->servptr) && target_p->from != source_p->from)
-<
+    sendto_realops_flags(UMODE_DEBUG, L_ALL,
->
+    sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
+                         "Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
+                         source_p->from->name, source_p->name, source_p->username,
+                         source_p->host, source_p->servptr->name,
+    if (!IsHostChar(*p))
+      return 0;
-<
+  return 1;
->
+  return p - hostname <= HOSTLEN;
+/* valid_username()
+/* report_and_set_user_flags()
+ * inputs       - pointer to source_p
-<
+ *              - pointer to aconf for this user
->
+ *              - pointer to conf for this user
+ * output       - NONE
+ * side effects - Report to user any special flags
+ *                they are getting, and set them.
+ */
+static void
-<
+report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
->
+report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
+  /* If this user is being spoofed, tell them so */
-<
+  if (IsConfDoSpoofIp(aconf))
->
+  if (IsConfDoSpoofIp(conf))
+    sendto_one(source_p,
+               ":%s NOTICE %s :*** Spoofing your IP. congrats.",
+  /* If this user is in the exception class, Set it "E lined" */
-<
+  if (IsConfExemptKline(aconf))
->
+  if (IsConfExemptKline(conf))
+    SetExemptKline(source_p);
+    sendto_one(source_p,
+  /* The else here is to make sure that G line exempt users
+   * do not get noticed twice.
+   */
-<
+  else if (IsConfExemptGline(aconf))
->
+  else if (IsConfExemptGline(conf))
+    SetExemptGline(source_p);
+    sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
+               me.name, source_p->name);
-<
+  if (IsConfExemptResv(aconf))
->
+  if (IsConfExemptResv(conf))
+    SetExemptResv(source_p);
+    sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
+  /* If this user is exempt from user limits set it "F lined" */
-<
+  if (IsConfExemptLimits(aconf))
->
+  if (IsConfExemptLimits(conf))
+    SetExemptLimits(source_p);
+    sendto_one(source_p,
+               me.name,source_p->name);
-<
+  if (IsConfCanFlood(aconf))
->
+  if (IsConfCanFlood(conf))
+    SetCanFlood(source_p);
+    sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
+    return;
-–
+  if (IsServer(source_p))
-–
+  {
-–
+     sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
-–
+                          parv[1], source_p->name);
-–
+     return;
-–
+  }
-–
+  if (source_p != target_p)
+     sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
+              dlink_node *dm;
-<
+              detach_conf(source_p, OPER_TYPE);
->
+              detach_conf(source_p, CONF_OPER);
+              ClrOFlag(source_p);
+              DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
+    send_umode(client_p, source_p, old, 0xffffffff, buf);
-+
+void
-+
+user_set_hostmask(struct Client *target_p, const char *hostname)
-+
+{
-+
+  if (!valid_hostname(hostname))
-+
+    return;
-+
-+
+  if (IsUserHostIp(target_p))
-+
+    delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
-+
-+
+  strlcpy(target_p->host, hostname, sizeof(target_p->host));
-+
+  SetIPSpoof(target_p);
-+
-+
+  add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
-+
+  SetUserHost(target_p);
-+
-+
+  if (MyClient(target_p))
-+
+    clear_ban_cache_client(target_p);
-+
+}
-+
+/* user_welcome()
+ * inputs       - client pointer to client to welcome
+static int
+check_xline(struct Client *source_p)
-<
+  struct ConfItem *conf = NULL;
->
+  struct MaskItem *conf = NULL;
+  const char *reason = NULL;
-<
+  if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
-<
+      (conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
->
+  if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
->
+      (conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
-<
+    struct MatchItem *reg = map_to_conf(conf);
-<
-<
+    ++reg->count;
->
+    ++conf->count;
-<
+    if (reg->reason != NULL)
-<
+      reason = reg->reason;
->
+    if (conf->reason != NULL)
->
+      reason = conf->reason;
+    else
+      reason = "No Reason";
-<
+    sendto_realops_flags(UMODE_REJ, L_ALL,
->
+    sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
+                         "X-line Rejecting [%s] [%s], user %s [%s]",
+                         source_p->info, reason,
+                         get_client_name(source_p, HIDE_IP),
+ * inputs       - pointer to given client to oper
+ * output       - NONE
-<
+ * side effects - Blindly opers up given source_p, using aconf info
->
+ * side effects - Blindly opers up given source_p, using conf info
+ *                all checks on passwords have already been done.
+ *                This could also be used by rsa oper routines.
+ */
+oper_up(struct Client *source_p)
+  const unsigned int old = source_p->umodes;
-<
+  const struct AccessItem *oconf = NULL;
->
+  const struct MaskItem *conf = source_p->localClient->confs.head->data;
+  assert(source_p->localClient->confs.head);
-–
+  oconf = map_to_conf((source_p->localClient->confs.head)->data);
+  ++Count.oper;
+  SetOper(source_p);
-<
+  if (oconf->modes)
-<
+    AddUMode(source_p, oconf->modes);
->
+  if (conf->modes)
->
+    AddUMode(source_p, conf->modes);
+  else if (ConfigFileEntry.oper_umodes)
+    AddUMode(source_p, ConfigFileEntry.oper_umodes);
+  assert(dlinkFind(&oper_list, source_p) == NULL);
+  dlinkAdd(source_p, make_dlink_node(), &oper_list);
-<
+  AddOFlag(source_p, oconf->port);
->
+  AddOFlag(source_p, conf->port);
+  if (HasOFlag(source_p, OPER_FLAG_ADMIN))
+    AddUMode(source_p, UMODE_ADMIN);
+  if (!HasOFlag(source_p, OPER_FLAG_N))
+    DelUMode(source_p, UMODE_NCHANGE);
-<
+  sendto_realops_flags(UMODE_ALL, L_ALL, "%s is now an operator",
->
+  sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
+                       get_oper_name(source_p));
+  send_umode_out(source_p, source_p, old);
+  sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
+  add_isupport("DEAF", "D", -1);
+  add_isupport("KICKLEN", NULL, KICKLEN);
+  add_isupport("MODES", NULL, MAXMODEPARAMS);
-–
+  add_isupport("NICKLEN", NULL, NICKLEN);
+#ifdef HALFOPS
+  add_isupport("PREFIX", "(ohv)@%+", -1);
+  add_isupport("STATUSMSG", "@%+", -1);
+  add_isupport("PREFIX", "(ov)@+", -1);
+  add_isupport("STATUSMSG", "@+", -1);
+#endif
-–
+  add_isupport("TOPICLEN", NULL, TOPICLEN);
+/*
+    dlinkAddTail(support, &support->node, &support_list);
-<
+  DupString(support->name, name);
->
+  support->name = xstrdup(name);
+  if (options != NULL)
-<
+    DupString(support->options, options);
->
+    support->options = xstrdup(options);
+  support->number = n;
+  rebuild_isupport_message_line();
+    struct Isupport *support = ptr->data;
-<
+    p += (n = ircsprintf(p, "%s", support->name));
->
+    p += (n = sprintf(p, "%s", support->name));
+    len += n;
+    if (support->options != NULL)
-<
+      p += (n = ircsprintf(p, "=%s", support->options));
->
+      p += (n = sprintf(p, "=%s", support->options));
+      len += n;
+    if (support->number > 0)
-<
+      p += (n = ircsprintf(p, "=%d", support->number));
->
+      p += (n = sprintf(p, "=%d", support->number));
+      len += n;

Diff Legend

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

Comparing: ircd-hybrid-8/src/s_user.c (file contents), Revision 1559 by michael, Sun Oct 14 01:38:28 2012 UTC vs. ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1819 by michael, Fri Apr 12 11:57:26 2013 UTC

Diff Legend

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1559 by michael, Sun Oct 14 01:38:28 2012 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1819 by michael, Fri Apr 12 11:57:26 2013 UTC