ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/hopm/branches/1.0.x/src/irc.c
(Generate patch)

Comparing hopm/branches/1.0.x/src/irc.c (file contents):
Revision 5320 by michael, Mon Jan 5 19:27:13 2015 UTC vs.
Revision 5321 by michael, Tue Jan 6 14:59:31 2015 UTC

# Line 65 | Line 65 | static struct ChannelConf *get_channel(c
65   static struct UserInfo *userinfo_create(char *);
66   static void userinfo_free(struct UserInfo *source);
67  
68 < static void m_ping(char **, unsigned int, char *, struct UserInfo *);
69 < static void m_invite(char **, unsigned int, char *, struct UserInfo *);
70 < static void m_privmsg(char **, unsigned int, char *, struct UserInfo *);
71 < static void m_ctcp(char **, unsigned int, char *, struct UserInfo *);
72 < static void m_notice(char **, unsigned int, char *, struct UserInfo *);
73 < static void m_perform(char **, unsigned int, char *, struct UserInfo *);
74 < static void m_userhost(char **, unsigned int, char *, struct UserInfo *);
75 < static void m_cannot_join(char **, unsigned int, char *, struct UserInfo *);
76 < static void m_kill(char **, unsigned int, char *, struct UserInfo *);
68 > static void m_ping(char *[], unsigned int, char *, struct UserInfo *);
69 > static void m_invite(char *[], unsigned int, char *, struct UserInfo *);
70 > static void m_privmsg(char *[], unsigned int, char *, struct UserInfo *);
71 > static void m_ctcp(char *[], unsigned int, char *, struct UserInfo *);
72 > static void m_notice(char *[], unsigned int, char *, struct UserInfo *);
73 > static void m_perform(char *[], unsigned int, char *, struct UserInfo *);
74 > static void m_userhost(char *[], unsigned int, char *, struct UserInfo *);
75 > static void m_cannot_join(char *[], unsigned int, char *, struct UserInfo *);
76 > static void m_kill(char *[], unsigned int, char *, struct UserInfo *);
77  
78 extern struct cnode *nc_head;
78  
79   /*
80   * Certain variables we don't want to allocate memory for over and over
# Line 556 | Line 555 | irc_timer(void)
555      log_printf("IRC -> Timeout awaiting data from server.");
556      irc_reconnect();
557  
558 <    /* Make sure we dont do this again for a while */
558 >    /* Make sure we don't do this again for a while */
559      time(&IRC_LAST);
560    }
561    else if (delta >= IRCItem->readtimeout / 2)
562    {
563      /*
564 <     * Generate some data so high ping times or bugs in certain
566 <     * ircds (*cough* unreal *cough*) don't cause uneeded
564 >     * Generate some data so high ping times don't cause uneeded
565       * reconnections
566       */
567      irc_send("PING :HOPM");
# Line 687 | Line 685 | userinfo_free(struct UserInfo *source_p)
685   * the source (parv[0]) is a server.
686   */
687   static void
688 < m_perform(char **parv, unsigned int parc, char *msg, struct UserInfo *notused)
688 > m_perform(char *parv[], unsigned int parc, char *msg, struct UserInfo *notused)
689   {
690    node_t *node;
691  
# Line 736 | Line 734 | m_perform(char **parv, unsigned int parc
734   * the source (parv[0]) is a server.
735   */
736   static void
737 < m_ping(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
737 > m_ping(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
738   {
739    if (parc < 3)
740      return;
# Line 758 | Line 756 | m_ping(char **parv, unsigned int parc, c
756   * the source (parv[0]) is a server.
757   */
758   static void
759 < m_invite(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
759 > m_invite(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
760   {
761 <  struct ChannelConf *channel;
761 >  struct ChannelConf *channel = NULL;
762  
763    if (parc < 4)
764      return;
# Line 784 | Line 782 | m_invite(char **parv, unsigned int parc,
782   * the source (parv[0]) is a server.
783   */
784   static void
785 < m_privmsg(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
785 > m_privmsg(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
786   {
787 <  struct ChannelConf *channel;
787 >  struct ChannelConf *channel = NULL;
788    size_t nick_len;
789  
790    if (source_p == NULL)
# Line 833 | Line 831 | m_privmsg(char **parv, unsigned int parc
831   *
832   */
833   static void
834 < m_ctcp(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
834 > m_ctcp(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
835   {
836    if (strncasecmp(parv[3], "\001VERSION\001", 9) == 0)
837      irc_send("NOTICE %s :\001VERSION Hybrid Open Proxy Monitor %s\001",
# Line 853 | Line 851 | m_ctcp(char **parv, unsigned int parc, c
851   *
852   */
853   static void
854 < m_notice(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
854 > m_notice(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
855   {
856    static regex_t *preg = NULL;
857    regmatch_t pmatch[5];
858    int errnum;
859    char *user[4];
860  
863  if (parc < 4)
864    return;
865
861    /* Not interested in notices from users */
862    if (source_p)
863      return;
864  
865 +  if (parc < 4)
866 +    return;
867 +
868    /* Compile the regular expression if it has not been already */
869    if (preg == NULL)
870    {
# Line 941 | Line 939 | m_notice(char **parv, unsigned int parc,
939   *
940   */
941   static void
942 < m_userhost(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
942 > m_userhost(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
943   {
944    if (parc < 4)
945      return;
# Line 959 | Line 957 | m_userhost(char **parv, unsigned int par
957   *
958   */
959   static void
960 < m_cannot_join(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
960 > m_cannot_join(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
961   {
962    const struct ChannelConf *channel = NULL;
963  
# Line 986 | Line 984 | m_cannot_join(char **parv, unsigned int
984   *
985   */
986   static void
987 < m_kill(char **parv, unsigned int parc, char *msg, struct UserInfo *source_p)
987 > m_kill(char *parv[], unsigned int parc, char *msg, struct UserInfo *source_p)
988   {
989    /* Restart hopm to rehash */
990    main_restart();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines