ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/modules/core/m_kill.c
Revision 8436 - (view) (annotate) - [select for diffs]
Modified Thu Mar 29 09:04:53 2018 UTC (6 years ago) by michael
File length: 8778 byte(s)
Diff to previous 8430 , to selected 4883
- Stylistic changes

Revision 8430 - (view) (annotate) - [select for diffs]
Modified Tue Mar 27 18:48:40 2018 UTC (6 years ago) by michael
File length: 8792 byte(s)
Diff to previous 8280 , to selected 4883
- Stylistic changes

Revision 8280 - (view) (annotate) - [select for diffs]
Modified Tue Feb 20 19:30:33 2018 UTC (6 years, 1 month ago) by michael
File length: 8803 byte(s)
Diff to previous 8058 , to selected 4883
- Update copyright years

Revision 8058 - (view) (annotate) - [select for diffs]
Modified Thu Mar 23 16:13:10 2017 UTC (7 years ago) by michael
File length: 8803 byte(s)
Diff to previous 7925 , to selected 4883
- Fixed style inconsistencies in various places

Revision 7925 - (view) (annotate) - [select for diffs]
Modified Sat Dec 31 13:57:24 2016 UTC (7 years, 2 months ago) by michael
File length: 8830 byte(s)
Diff to previous 7922 , to selected 4883
- Update copyright years

Revision 7922 - (view) (annotate) - [select for diffs]
Modified Tue Dec 6 20:49:02 2016 UTC (7 years, 3 months ago) by michael
File length: 8830 byte(s)
Diff to previous 7920 , to selected 4883
- m_kill.c:mo_kill(): removed old irc2.6 comment no longer valid these days

Revision 7920 - (view) (annotate) - [select for diffs]
Modified Tue Dec 6 20:24:38 2016 UTC (7 years, 3 months ago) by michael
File length: 8873 byte(s)
Diff to previous 7512 , to selected 4883
- m_kill.c: removed target's SID from the kill notice

Revision 7512 - (view) (annotate) - [select for diffs]
Modified Sat Mar 26 19:55:16 2016 UTC (8 years ago) by michael
File length: 8999 byte(s)
Diff to previous 7461 , to selected 4883
- Removed KILLLEN; use REASONLEN instead

Revision 7461 - (view) (annotate) - [select for diffs]
Modified Sat Mar 12 13:12:11 2016 UTC (8 years ago) by michael
File length: 8995 byte(s)
Diff to previous 7329 , to selected 4883
- m_kill.c:mo_kill(): remove ueseless cast

Revision 7329 - (view) (annotate) - [select for diffs]
Modified Thu Feb 18 21:07:50 2016 UTC (8 years, 1 month ago) by michael
File length: 9006 byte(s)
Diff to previous 7007 , to selected 4883
- Now that we got time_t to work nicely on openbsd with snprintf's conversion specifiers,
  we ran into a similiar issue on Raspbian/ARMv7's time_t which is of signed 32 bit and
  doesn't cope at all with %j. Instead of doing tricks, get rid of time_t everywhere and
  forever and use uintmax_t instead which has at least a 'standardized' conversion specifier
  associated with it.

Revision 7007 - (view) (annotate) - [select for diffs]
Modified Fri Jan 1 00:09:08 2016 UTC (8 years, 2 months ago) by michael
File length: 9003 byte(s)
Diff to previous 6317 , to selected 4883
- Update copyright years

Revision 6317 - (view) (annotate) - [select for diffs]
Modified Wed Aug 5 16:03:09 2015 UTC (8 years, 7 months ago) by michael
File length: 9003 byte(s)
Diff to previous 5880 , to selected 4883
- Get rid of UMODE_ALL

Revision 5880 - (view) (annotate) - [select for diffs]
Modified Sun May 3 16:01:42 2015 UTC (8 years, 10 months ago) by michael
File length: 8989 byte(s)
Diff to previous 5863 , to selected 4883
- Use C99-style initializers in all struct Message items
- Removed MFLG_SLOW
- Removed DUMMY_HANDLER

Revision 5863 - (view) (annotate) - [select for diffs]
Modified Tue Apr 28 12:23:14 2015 UTC (8 years, 11 months ago) by michael
File length: 8843 byte(s)
Diff to previous 5346 , to selected 4883
- Removed useless zero initializers from the module_entry as suggested by Adam

Revision 5346 - (view) (annotate) - [select for diffs]
Modified Sun Jan 11 12:41:14 2015 UTC (9 years, 2 months ago) by michael
File length: 8916 byte(s)
Diff to previous 4963 , to selected 4883
- Update copyright years

Revision 4963 - (view) (annotate) - [select for diffs]
Modified Mon Dec 1 13:08:44 2014 UTC (9 years, 3 months ago) by michael
File length: 8916 byte(s)
Diff to previous 4883
- Get rid of NOCAPS

Revision 4883 - (view) (annotate) - [selected]
Modified Tue Nov 18 16:22:18 2014 UTC (9 years, 4 months ago) by michael
File length: 8936 byte(s)
Diff to previous 4702
- Style corrections; fixed comments

Revision 4702 - (view) (annotate) - [select for diffs]
Modified Sun Oct 5 16:18:54 2014 UTC (9 years, 5 months ago) by michael
File length: 8994 byte(s)
Diff to previous 4601 , to selected 4883
- m_kill.c:ms_kill(): replaced HasUMode(source_p, UMODE_OPER) with just IsClient(source_p)

Revision 4601 - (view) (annotate) - [select for diffs]
Modified Sat Aug 30 17:24:01 2014 UTC (9 years, 6 months ago) by michael
File length: 9006 byte(s)
Diff to previous 4564 , to selected 4883
- m_kill.c: doxygen

Revision 4564 - (view) (annotate) - [select for diffs]
Modified Sun Aug 24 10:24:47 2014 UTC (9 years, 7 months ago) by michael
File length: 8168 byte(s)
Diff to previous 4546 , to selected 4883
- Update GPL 2 license headers

Revision 4546 - (view) (annotate) - [select for diffs]
Modified Fri Aug 22 08:46:38 2014 UTC (9 years, 7 months ago) by michael
File length: 8164 byte(s)
Diff to previous 4341 , to selected 4883
- Fixed compile warnings with -Wmissing-field-initializers

Revision 4341 - (view) (annotate) - [select for diffs]
Modified Sat Aug 2 16:53:48 2014 UTC (9 years, 7 months ago) by michael
File length: 8158 byte(s)
Diff to previous 4299 , to selected 4883
- Renamed structures to meet code conventions

Revision 4299 - (view) (annotate) - [select for diffs]
Modified Sun Jul 20 13:51:28 2014 UTC (9 years, 8 months ago) by michael
File length: 8160 byte(s)
Diff to previous 3432 , to selected 4883
- Fixed typos all over the place

Revision 3432 - (view) (annotate) - [select for diffs]
Modified Thu May 1 12:44:46 2014 UTC (9 years, 10 months ago) by michael
File length: 8158 byte(s)
Diff to previous 3377 , to selected 4883
- Replace few hash_find_id() with find_person()

Revision 3377 - (view) (annotate) - [select for diffs]
Modified Thu Apr 24 16:15:51 2014 UTC (9 years, 11 months ago) by michael
File length: 8149 byte(s)
Diff to previous 3347 , to selected 4883
- Create 8.2.x branch

Revision 3347 - (view) (annotate) - [select for diffs]
Modified Sun Apr 20 14:03:06 2014 UTC (9 years, 11 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 8149 byte(s)
Diff to previous 3201 , to selected 4883
- Moved files:
  s_user.c -> user.c
  s_misc.c -> misc.c
  s_serv.c -> server.c

Revision 3201 - (view) (annotate) - [select for diffs]
Modified Mon Mar 24 17:09:10 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 8149 byte(s)
Diff to previous 3200 , to selected 4883
- m_kill.c: further cleanups

Revision 3200 - (view) (annotate) - [select for diffs]
Modified Mon Mar 24 16:17:44 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 8238 byte(s)
Diff to previous 3197 , to selected 4883
- m_kill.c: cleanup ms_kill(). parv[2] must be non-null; otherwise the KILL
  is silently dropped.

Revision 3197 - (view) (annotate) - [select for diffs]
Modified Sun Mar 23 20:26:09 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 8606 byte(s)
Diff to previous 3195 , to selected 4883
- m_kill.c:ms_kill(): fixed compile warning

Revision 3195 - (view) (annotate) - [select for diffs]
Modified Sun Mar 23 20:01:32 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 8605 byte(s)
Diff to previous 3179 , to selected 4883
- m_kill.c: cleanup ms_kill(). Now no longer doing the find_chasing stuff, since
  ms_kill() only deals with targets being an UID.

Revision 3179 - (view) (annotate) - [select for diffs]
Modified Wed Mar 19 18:43:49 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9155 byte(s)
Diff to previous 3171 , to selected 4883
- m_kill.c: get rid of relay_kill()

Revision 3171 - (view) (annotate) - [select for diffs]
Modified Sun Mar 16 11:51:48 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9685 byte(s)
Diff to previous 3156 , to selected 4883
- Incorporate Adam's exit_client/quit storm cleanups
  Note: QS is mandatory now

Revision 3156 - (view) (annotate) - [select for diffs]
Modified Fri Mar 14 19:57:38 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9705 byte(s)
Diff to previous 3110 , to selected 4883
- Removed client_p pointers from everywhere

Revision 3110 - (view) (annotate) - [select for diffs]
Modified Thu Mar 6 20:33:17 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9825 byte(s)
Diff to previous 3109 , to selected 4883
- Added sendto_one_notice()

Revision 3109 - (view) (annotate) - [select for diffs]
Modified Thu Mar 6 19:25:12 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9864 byte(s)
Diff to previous 3096 , to selected 4883
- Applied Adam's sendto_one_numeric() changes

Revision 3096 - (view) (annotate) - [select for diffs]
Modified Sat Mar 1 23:31:45 2014 UTC (10 years ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 10164 byte(s)
Diff to previous 2820 , to selected 4883
- Applied Adam's "Put the command name in parv[0], not prefix name" patch

Revision 2820 - (view) (annotate) - [select for diffs]
Modified Wed Jan 15 23:10:26 2014 UTC (10 years, 2 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 10176 byte(s)
Diff to previous 2801 , to selected 4883
- Clean up all files in modules/ (fixed indentation, removed whitespaces/tabs)
- Fixed copyright years
- Made module handlers int type for later use

Revision 2801 - (view) (annotate) - [select for diffs]
Modified Sat Jan 11 21:23:41 2014 UTC (10 years, 2 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 10098 byte(s)
Diff to previous 2300 , to selected 4883
- Fixed inconsistent ERR_NOPRIVS vs. ERR_NOPRIVILEGES mess

Revision 2300 - (view) (annotate) - [select for diffs]
Modified Wed Jun 19 12:10:37 2013 UTC (10 years, 9 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9977 byte(s)
Diff to previous 2037 , to selected 4883
- whowas: Renamed functions.
  add_history -> whowas_add_history
  off_history -> whowas_off_history
  get_history -> whowas_get_history

Revision 2037 - (view) (annotate) - [select for diffs]
Modified Tue May 14 19:08:13 2013 UTC (10 years, 10 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9963 byte(s)
Diff to previous 2012 , to selected 4883
- Improve KILL server notice to be more specific about the client being
  killed (ircnet style)

Revision 2012 - (view) (annotate) - [select for diffs]
Modified Sun May 12 14:47:26 2013 UTC (10 years, 10 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9352 byte(s)
Diff to previous 1834 , to selected 4883
- Removed 'remote', and 'global_kill' oper flags, and added 'connect',
  'squit', and 'kill' flags for better fine-tuning instead. Whether or 
  not a specific action is allowed on a remote server can be controlled
  by appeding the ':remote' flag. For example: 'kill' allows only local
  clients to be killed, whereas 'kill:remote' allows to issue a KILL for
  remote clients

Revision 1834 - (view) (annotate) - [select for diffs]
Modified Fri Apr 19 19:50:27 2013 UTC (10 years, 11 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9490 byte(s)
Diff to previous 1832 , to selected 4883
- Revert to -r1831

Revision 1832 - (view) (annotate) - [select for diffs]
Modified Fri Apr 19 19:16:09 2013 UTC (10 years, 11 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9420 byte(s)
Diff to previous 1794 , to selected 4883
- Made all numeric defines use the actual string instead of the numeric value
  which allows to use gcc's printf format attribute
- Remove current message locale implementation

Revision 1794 - (view) (annotate) - [select for diffs]
Modified Sun Mar 31 14:17:46 2013 UTC (10 years, 11 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9490 byte(s)
Diff to previous 1793 , to selected 4883
- KLINE, DLINE, SQUIT and KILL now make use of CONF_NOREASON as well

Revision 1793 - (view) (annotate) - [select for diffs]
Modified Sun Mar 31 14:06:08 2013 UTC (10 years, 11 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9486 byte(s)
Diff to previous 1618 , to selected 4883
- Replaced all occurrences of ircsprintf with sprintf/snprintf
  and killed sprintf_irc.(c|h)

Revision 1618 - (view) (annotate) - [select for diffs]
Modified Tue Oct 30 21:04:38 2012 UTC (11 years, 4 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9511 byte(s)
Diff to previous 1592 , to selected 4883
- Made m_globops() and ms_globops() use sendto_realops_flags()
- Added message-type parameter to sendto_realops_flags() which can be one of
  SEND_NOTICE, SEND_GLOBAL, SEND_LOCOPS
- Forward-port -r1617

Revision 1592 - (view) (annotate) - [select for diffs]
Modified Sat Oct 27 21:02:32 2012 UTC (11 years, 5 months ago) by michael
Original Path: ircd-hybrid/trunk/modules/core/m_kill.c
File length: 9472 byte(s)
Diff to previous 1451 , to selected 4883
- Second time's the charm? Moving svnroot/ircd-hybrid-8 to
  svnroot/ircd-hybrid/trunk

Revision 1451 - (view) (annotate) - [select for diffs]
Modified Fri Jun 29 11:28:25 2012 UTC (11 years, 9 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9472 byte(s)
Diff to previous 1410 , to selected 4883
- Style corrections

Revision 1410 - (view) (annotate) - [select for diffs]
Modified Fri May 11 10:59:03 2012 UTC (11 years, 10 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9449 byte(s)
Diff to previous 1309 , to selected 4883
- mo_kill(): remove useless IsDigit() test. hash_find_client() doesn't do
  UID lookups, so we'll end up with ERR_NOSUCHNICK.

Revision 1309 - (view) (annotate) - [select for diffs]
Modified Sun Mar 25 11:24:18 2012 UTC (12 years ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9532 byte(s)
Diff to previous 1247 , to selected 4883
- renaming files:

  ircd_parser.y -> conf_parser.y
  ircd_lexer.l  -> conf_lexer.l
  s_conf.c      -> conf.c
  s_conf.h      -> conf.h
  s_log.c       -> log.c
  s_log.h       -> log.h

Revision 1247 - (view) (annotate) - [select for diffs]
Modified Sat Oct 1 07:54:24 2011 UTC (12 years, 5 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9536 byte(s)
Diff to previous 1243 , to selected 4883
- Rewrite and cleanup half-broken logging subsystem.
  Logfile rotating is not working yet

Revision 1243 - (view) (annotate) - [select for diffs]
Modified Fri Sep 30 10:47:53 2011 UTC (12 years, 6 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9597 byte(s)
Diff to previous 1230 , to selected 4883
- move content of msg.h, ircd_handler.h and handlers.h into parse.h and
  remove headers accordingly
- killed common.h
- remove m_killhost.c and m_flags.c from contrib/
- sort out unused header includes here and there

Revision 1230 - (view) (annotate) - [select for diffs]
Modified Thu Sep 22 19:41:19 2011 UTC (12 years, 6 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9636 byte(s)
Diff to previous 1219 , to selected 4883
- cleanup module loader. Make module api more flexible

Revision 1219 - (view) (annotate) - [select for diffs]
Modified Sun Sep 18 09:02:38 2011 UTC (12 years, 6 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9573 byte(s)
Diff to previous 1178 , to selected 4883
- Start cleaning up macros in client.h. Replace several ClientHasSomeCoolFlag()
with simple HasFlag/HasUMode macros.

Revision 1178 - (view) (annotate) - [select for diffs]
Modified Mon Aug 15 08:11:31 2011 UTC (12 years, 7 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9501 byte(s)
Diff to previous 1169 , to selected 4883
- Cleanup and restore older parts of the irc-command parser.
  Gives back ability to specify maximum amount of parameters
  that are processed within a command.

Revision 1169 - (view) (annotate) - [select for diffs]
Modified Fri Aug 12 18:45:03 2011 UTC (12 years, 7 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9495 byte(s)
Diff to previous 1156 , to selected 4883
- rename find_server to hash_find_server to satisfy naming convention
- pull m_services.c and m_jupe.c from contrib/
- style fixes in some places

Revision 1156 - (view) (annotate) - [select for diffs]
Modified Tue Aug 9 20:29:20 2011 UTC (12 years, 7 months ago) by michael
Original Path: ircd-hybrid-8/modules/core/m_kill.c
File length: 9492 byte(s)
Diff to previous 1155 , to selected 4883
- create ircd-hybrid-8 "branch"

Revision 1155 - (view) (annotate) - [select for diffs]
Modified Tue Aug 9 20:27:45 2011 UTC (12 years, 7 months ago) by michael
Original Path: ircd-hybrid/modules/core/m_kill.c
File length: 9492 byte(s)
Diff to previous 1136 , to selected 4883
- recreate "trunk"

Revision 1136 - (view) (annotate) - [select for diffs]
Modified Sun May 29 18:53:45 2011 UTC (12 years, 10 months ago) by michael
Original Path: ircd-hybrid-7.3/modules/core/m_kill.c
File length: 9492 byte(s)
Diff to previous 1121 , to selected 4883
- m_kill.c: replace ircsprintf with snprintf

Revision 1121 - (view) (annotate) - [select for diffs]
Modified Sun Jan 9 11:03:03 2011 UTC (13 years, 2 months ago) by michael
Original Path: ircd-hybrid-7.3/modules/core/m_kill.c
File length: 9452 byte(s)
Diff to previous 1029 , to selected 4883
- removed all instances of STATIC_MODULES since we don't have
  static modules anymore
- removed m_mkpasswd module from contrib

Revision 1029 - (view) (annotate) - [select for diffs]
Modified Sun Nov 8 13:10:50 2009 UTC (14 years, 4 months ago) by michael
Original Path: ircd-hybrid-7.3/modules/core/m_kill.c
File length: 9482 byte(s)
Diff to previous 1028 , to selected 4883
- branch off trunk to create 7.3 branch
Revision 1028 - (view) (annotate) - [select for diffs]
Modified Sun Nov 8 13:03:38 2009 UTC (14 years, 4 months ago) by michael
Original Path: ircd-hybrid/modules/core/m_kill.c
File length: 9482 byte(s)
Diff to previous 1011 , to selected 4883
- move ircd-hybrid-7.2 to trunk

Revision 1011 - (view) (annotate) - [select for diffs]
Modified Fri Sep 18 10:14:09 2009 UTC (14 years, 6 months ago) by michael
Original Path: ircd-hybrid-7.2/modules/core/m_kill.c
File length: 9482 byte(s)
Diff to previous 885 , to selected 4883
- move list manipulation routines from tools.c to list.c
- mem_frob() goes to memory.c
- sort out redundant/unneeded header includes

Revision 885 - (view) (annotate) - [select for diffs]
Modified Wed Oct 31 18:09:24 2007 UTC (16 years, 5 months ago) by michael
Original Path: ircd-hybrid-7.2/modules/core/m_kill.c
File length: 9464 byte(s)
Diff to previous 34 , to selected 4883
- Removed LazyLinks in 7.2 to stop people from asking why we keep
  broken code for half a decade. LL will be implemented in a smarter
  fashion in due time

Revision 34 - (view) (annotate) - [select for diffs]
Modified Sun Oct 2 21:05:51 2005 UTC (18 years, 5 months ago) by lusky
Original Path: ircd-hybrid-7.2/modules/core/m_kill.c
File length: 10652 byte(s)
Diff to previous 33 , to selected 4883
create 7.2 branch, we can move/rename it as needed.


Revision 33 - (view) (annotate) - [select for diffs]
Modified Sun Oct 2 20:50:00 2005 UTC (18 years, 5 months ago) by knight
Original Path: ircd-hybrid/modules/core/m_kill.c
File length: 10652 byte(s)
Diff to previous 32 , to selected 4883
- svn:keywords

Revision 32 - (view) (annotate) - [select for diffs]
Modified Sun Oct 2 20:41:23 2005 UTC (18 years, 5 months ago) by knight
Original Path: ircd-hybrid/modules/core/m_kill.c
File length: 10652 byte(s)
Diff to previous 31 , to selected 4883
- svn:keywords

Revision 31 - (view) (annotate) - [select for diffs]
Modified Sun Oct 2 20:34:05 2005 UTC (18 years, 5 months ago) by knight
Original Path: ircd-hybrid/modules/core/m_kill.c
File length: 10652 byte(s)
Diff to previous 30 , to selected 4883
- Fix svn:keywords

Revision 30 - (view) (annotate) - [select for diffs]
Added Sun Oct 2 20:03:27 2005 UTC (18 years, 5 months ago) by adx
Original Path: ircd-hybrid/modules/core/m_kill.c
File length: 10704 byte(s)
Diff to selected 4883
- imported sources
- can be moved later according to the directory/branching scheme,
  but we need the svn up

Convenience Links

Links to HEAD: (view) (annotate)

Compare Revisions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a