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 4792 by michael, Tue Oct 28 12:44:43 2014 UTC vs.
Revision 5558 by michael, Fri Feb 13 20:45:49 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 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 210 | Line 171 | show_lusers(struct Client *source_p)
171   void
172   show_isupport(struct Client *source_p)
173   {
174 <  const dlink_node *ptr = NULL;
174 >  const dlink_node *node = NULL;
175  
176 <  DLINK_FOREACH(ptr, support_list_lines.head)
177 <    sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
176 >  DLINK_FOREACH(node, support_list_lines.head)
177 >    sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
178   }
179  
180  
# Line 232 | Line 193 | report_and_set_user_flags(struct Client
193    if (IsConfDoSpoofIp(conf))
194      sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
195  
196 <  /* If this user is in the exception class, Set it "E lined" */
196 >  /* If this user is in the exception class, set it "E lined" */
197    if (IsConfExemptKline(conf))
198    {
199      SetExemptKline(source_p);
# Line 281 | Line 242 | report_and_set_user_flags(struct Client
242   static void
243   introduce_client(struct Client *source_p)
244   {
245 <  dlink_node *ptr = NULL;
245 >  dlink_node *node = NULL;
246    char ubuf[IRCD_BUFSIZE] = "";
247  
248    if (MyClient(source_p))
# Line 297 | Line 258 | introduce_client(struct Client *source_p
258      ubuf[1] = '\0';
259    }
260  
261 <  DLINK_FOREACH(ptr, local_server_list.head)
261 >  DLINK_FOREACH(node, local_server_list.head)
262    {
263 <    struct Client *server = ptr->data;
263 >    struct Client *server = node->data;
264  
265      if (server == source_p->from)
266        continue;
# Line 310 | Line 271 | introduce_client(struct Client *source_p
271                   source_p->name, source_p->hopcount+1,
272                   (unsigned long)source_p->tsinfo,
273                   ubuf, source_p->username, source_p->host,
274 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
275 <                 "0" : source_p->sockhost, source_p->id,
315 <                 source_p->svid,
274 >                 source_p->sockhost, source_p->id,
275 >                 source_p->account,
276                   source_p->info);
277      else
278        sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
# Line 320 | Line 280 | introduce_client(struct Client *source_p
280                   source_p->name, source_p->hopcount+1,
281                   (unsigned long)source_p->tsinfo,
282                   ubuf, source_p->username, source_p->host,
283 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
324 <                 "0" : source_p->sockhost, source_p->id, source_p->info);
283 >                 source_p->sockhost, source_p->id, source_p->info);
284  
285      if (!EmptyString(source_p->certfp))
286        sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
# Line 375 | Line 334 | static int
334   check_xline(struct Client *source_p)
335   {
336    struct MaskItem *conf = NULL;
378  const char *reason = NULL;
337  
338    if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
339    {
340      ++conf->count;
383
384    if (conf->reason)
385      reason = conf->reason;
386    else
387      reason = CONF_NOREASON;
388
341      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
342                           "X-line Rejecting [%s] [%s], user %s [%s]",
343 <                         source_p->info, reason,
343 >                         source_p->info, conf->reason,
344                           get_client_name(source_p, HIDE_IP),
345                           source_p->sockhost);
346  
# Line 511 | Line 463 | register_local_user(struct Client *sourc
463     * probably be just a percentage of the MAXCLIENTS...
464     *   -Taner
465     */
466 <  if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
467 <      (Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
466 >  if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
467 >      (Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
468    {
469      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
470                           "Too many clients, rejecting %s[%s].",
# Line 547 | Line 499 | register_local_user(struct Client *sourc
499    sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
500                         "Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
501                         source_p->name, source_p->username, source_p->host,
502 <                       ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
551 <                       "255.255.255.255" : source_p->sockhost,
502 >                       source_p->sockhost,
503                         get_client_class(&source_p->connection->confs),
504                         source_p->info, source_p->id);
505  
# Line 612 | Line 563 | register_remote_user(struct Client *sour
563                           source_p->host, source_p->servptr->name,
564                           target_p->name, target_p->from->name);
565      sendto_one(source_p->from,
566 <               ":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
566 >               ":%s KILL %s :%s (UID from wrong direction (%s != %s))",
567                 me.id, source_p->id, me.name, source_p->servptr->name,
568                 target_p->from->name);
569  
570      AddFlag(source_p, FLAGS_KILLED);
571 <    exit_client(source_p, "USER server wrong direction");
571 >    exit_client(source_p, "UID server wrong direction");
572      return;
573    }
574  
# Line 638 | Line 589 | register_remote_user(struct Client *sour
589    SetUserHost(source_p);
590  
591    if (HasFlag(source_p->servptr, FLAGS_EOB))
592 <    sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
593 <                         "Client connecting at %s: %s (%s@%s) [%s] <%s>",
594 <                         source_p->servptr->name,
595 <                         source_p->name, source_p->username, source_p->host,
596 <                         source_p->info, source_p->id);
592 >  {
593 >    if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
594 >      sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
595 >                           "Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
596 >                           source_p->servptr->name,
597 >                           source_p->name, source_p->username, source_p->host,
598 >                           source_p->sockhost, source_p->info, source_p->id);
599 >    else
600 >      sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
601 >                           "Client connecting at %s: %s (%s@%s) [%s] <%s>",
602 >                           source_p->servptr->name,
603 >                           source_p->name, source_p->username, source_p->host,
604 >                           source_p->info, source_p->id);
605 >  }
606  
607    introduce_client(source_p);
608   }
# Line 740 | Line 700 | valid_nickname(const char *nickname, con
700   {
701    const char *p = nickname;
702  
703 <  assert(nickname && *nickname);
703 >  assert(p);
704  
705    /*
706     * Nicks can't start with a digit or - or be 0 length.
# Line 777 | Line 737 | send_umode(struct Client *client_p, stru
737     * Build a string in umode_buf to represent the change in the user's
738     * mode between the new (source_p->umodes) and 'old'.
739     */
740 <  for (unsigned int i = 0; i < 128; ++i)
740 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
741    {
742 <    unsigned int flag = user_modes[i];
783 <
784 <    if (!flag)
785 <      continue;
786 <
787 <    if ((flag & old) && !HasUMode(source_p, flag))
742 >    if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
743      {
744        if (what == MODE_DEL)
745 <        *m++ = (char)i;
745 >        *m++ = tab->c;
746        else
747        {
748          what = MODE_DEL;
749          *m++ = '-';
750 <        *m++ = (char)i;
750 >        *m++ = tab->c;
751        }
752      }
753 <    else if (!(flag & old) && HasUMode(source_p, flag))
753 >    else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
754      {
755        if (what == MODE_ADD)
756 <        *m++ = (char)i;
756 >        *m++ = tab->c;
757        else
758        {
759          what = MODE_ADD;
760          *m++ = '+';
761 <        *m++ = (char)i;
761 >        *m++ = tab->c;
762        }
763      }
764    }
# Line 830 | Line 785 | send_umode_out(struct Client *source_p,
785    send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
786  
787    if (buf[0])
788 <    sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
788 >    sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
789                    source_p->id, source_p->id, buf);
790   }
791  
792   void
793   user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
794   {
795 <  dlink_node *ptr = NULL;
795 >  dlink_node *node = NULL;
796  
797    if (!strcmp(target_p->host, hostname))
798      return;
# Line 846 | Line 801 | user_set_hostmask(struct Client *target_
801    {
802      case MODE_ADD:
803        AddUMode(target_p, UMODE_HIDDENHOST);
849      AddFlag(target_p, FLAGS_IP_SPOOFING);
804        break;
805      case MODE_DEL:
806        DelUMode(target_p, UMODE_HIDDENHOST);
853
854      if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
855        DelFlag(target_p, FLAGS_IP_SPOOFING);
807        break;
808      default: return;
809    }
# Line 878 | Line 829 | user_set_hostmask(struct Client *target_
829    if (!ConfigGeneral.cycle_on_host_change)
830      return;
831  
832 <  DLINK_FOREACH(ptr, target_p->channel.head)
832 >  DLINK_FOREACH(node, target_p->channel.head)
833    {
834      char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
835      char *p = modebuf;
836      int len = 0;
837 <    const struct Membership *ms = ptr->data;
837 >    const struct Membership *member = node->data;
838  
839 <    if (has_member_flags(ms, CHFL_CHANOP))
839 >    if (has_member_flags(member, CHFL_CHANOP))
840      {
841        *p++ = 'o';
842        len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
843      }
844  
845 <    if (has_member_flags(ms, CHFL_HALFOP))
845 >    if (has_member_flags(member, CHFL_HALFOP))
846      {
847        *p++ = 'h';
848        len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
849      }
850  
851 <    if (has_member_flags(ms, CHFL_VOICE))
851 >    if (has_member_flags(member, CHFL_VOICE))
852      {
853        *p++ = 'v';
854        len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
# Line 906 | Line 857 | user_set_hostmask(struct Client *target_
857      *p = '\0';
858  
859  
860 <    sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, ms->chptr, ":%s!%s@%s JOIN %s %s :%s",
860 >    sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
861                                  target_p->name, target_p->username,
862 <                                target_p->host, ms->chptr->name,
863 <                                (!IsDigit(target_p->svid[0]) && target_p->svid[0] != '*') ? target_p->svid : "*",
862 >                                target_p->host, member->chptr->name,
863 >                                (!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
864                                  target_p->info);
865 <    sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, ms->chptr, ":%s!%s@%s JOIN :%s",
865 >    sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
866                                  target_p->name, target_p->username,
867 <                                target_p->host, ms->chptr->name);
867 >                                target_p->host, member->chptr->name);
868  
869      if (nickbuf[0])
870 <      sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
871 <                                  target_p->servptr->name, ms->chptr->name,
870 >      sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
871 >                                  target_p->servptr->name, member->chptr->name,
872                                    modebuf, nickbuf);
873  
874    }
# Line 962 | Line 913 | oper_up(struct Client *source_p)
913    if (HasOFlag(source_p, OPER_FLAG_ADMIN))
914      AddUMode(source_p, UMODE_ADMIN);
915  
916 +  if (!EmptyString(conf->whois))
917 +  {
918 +    client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
919 +    sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
920 +                  me.id, source_p->id, (unsigned long)source_p->tsinfo,
921 +                  RPL_WHOISOPERATOR, conf->whois);
922 +  }
923 +
924    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
925                         get_oper_name(source_p));
926 <  sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
926 >  sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
927                  me.id, get_oper_name(source_p));
928    send_umode_out(source_p, old);
929    sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
# Line 1072 | Line 1031 | init_isupport(void)
1031    add_isupport("MODES", NULL, MAXMODEPARAMS);
1032    add_isupport("PREFIX", "(ohv)@%+", -1);
1033    add_isupport("STATUSMSG", "@%+", -1);
1034 <  add_isupport("EXCEPTS", "e", -1);
1035 <  add_isupport("INVEX", "I", -1);
1034 >  add_isupport("EXCEPTS", NULL, -1);
1035 >  add_isupport("INVEX", NULL, -1);
1036   }
1037  
1038   /*
# Line 1088 | Line 1047 | init_isupport(void)
1047   void
1048   add_isupport(const char *name, const char *options, int n)
1049   {
1050 <  dlink_node *ptr;
1050 >  dlink_node *node = NULL;
1051    struct Isupport *support = NULL;
1052  
1053 <  DLINK_FOREACH(ptr, support_list.head)
1053 >  DLINK_FOREACH(node, support_list.head)
1054    {
1055 <    support = ptr->data;
1055 >    support = node->data;
1056      if (irccmp(support->name, name) == 0)
1057      {
1058        MyFree(support->name);
# Line 1102 | Line 1061 | add_isupport(const char *name, const cha
1061      }
1062    }
1063  
1064 <  if (ptr == NULL)
1064 >  if (node == NULL)
1065    {
1066      support = MyCalloc(sizeof(*support));
1067      dlinkAddTail(support, &support->node, &support_list);
# Line 1126 | Line 1085 | add_isupport(const char *name, const cha
1085   void
1086   delete_isupport(const char *name)
1087   {
1088 <  dlink_node *ptr;
1130 <  struct Isupport *support;
1088 >  dlink_node *node = NULL;
1089  
1090 <  DLINK_FOREACH(ptr, support_list.head)
1090 >  DLINK_FOREACH(node, support_list.head)
1091    {
1092 <    support = ptr->data;
1092 >    struct Isupport *support = node->data;
1093 >
1094      if (irccmp(support->name, name) == 0)
1095      {
1096 <      dlinkDelete(ptr, &support_list);
1096 >      dlinkDelete(node, &support_list);
1097        MyFree(support->name);
1098        MyFree(support->options);
1099        MyFree(support);
# Line 1157 | Line 1116 | rebuild_isupport_message_line(void)
1116   {
1117    char isupportbuffer[IRCD_BUFSIZE];
1118    char *p = isupportbuffer;
1119 <  dlink_node *ptr = NULL, *ptr_next = NULL;
1119 >  dlink_node *node = NULL, *node_next = NULL;
1120    int n = 0;
1121    int tokens = 0;
1122    size_t len = 0;
1123    size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1124  
1125 <  DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1125 >  DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1126    {
1127 <    dlinkDelete(ptr, &support_list_lines);
1128 <    MyFree(ptr->data);
1129 <    free_dlink_node(ptr);
1127 >    dlinkDelete(node, &support_list_lines);
1128 >    MyFree(node->data);
1129 >    free_dlink_node(node);
1130    }
1131  
1132 <  DLINK_FOREACH(ptr, support_list.head)
1132 >  DLINK_FOREACH(node, support_list.head)
1133    {
1134 <    struct Isupport *support = ptr->data;
1134 >    struct Isupport *support = node->data;
1135  
1136      p += (n = sprintf(p, "%s", support->name));
1137      len += n;

Diff Legend

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