gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 1 | -*- mode: text; -*- |
gdt | 697877e | 2004-11-15 19:23:47 +0000 | [diff] [blame^] | 2 | $Id: HACKING,v 1.12 2004/11/15 19:23:47 gdt Exp $ |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 3 | |
| 4 | GUIDELINES FOR HACKING ON QUAGGA |
| 5 | |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 6 | [this is a draft in progress] |
| 7 | |
hasso | 863076d | 2004-09-01 20:13:23 +0000 | [diff] [blame] | 8 | GNU coding standards apply. Indentation follows the result of |
| 9 | invoking GNU indent (as of 2.2.8a) with no arguments. Note that this |
| 10 | uses tabs instead of spaces where possible for leading whitespace, and |
| 11 | assumes that tabs are every 8 columns. Do not attempt to redefine the |
| 12 | location of tab stops. Note also that some indentation does not |
| 13 | follow GNU style. This is a historical accident, and we generally |
| 14 | only clean up whitespace when code is unmaintainable due to whitespace |
| 15 | issues, as fewer changes from zebra lead to easier merges. |
| 16 | |
| 17 | For GNU emacs, use indentation style "gnu". |
| 18 | |
| 19 | For Vim, use the following lines (note that tabs are at 8, and that |
| 20 | softtabstop sets the indentation level): |
| 21 | |
| 22 | set tabstop=8 |
| 23 | set softtabstop=2 |
| 24 | set shiftwidth=2 |
| 25 | set noexpandtab |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 26 | |
gdt | 2934f28 | 2004-01-05 20:09:00 +0000 | [diff] [blame] | 27 | Be particularly careful not to break platforms/protocols that you |
| 28 | cannot test. |
| 29 | |
| 30 | New code should have good comments, and changes to existing code |
| 31 | should in many cases upgrade the comments when necessary for a |
| 32 | reviewer to conclude that the change has no unintended consequences. |
| 33 | |
gdt | 697877e | 2004-11-15 19:23:47 +0000 | [diff] [blame^] | 34 | Each file in CVS should have the RCS keyword Id, somewhere very near |
| 35 | the top, commented out appropriately for the file type. Just add |
| 36 | <dollar>Id:<dollar>, replacing <dollar> with $. See line 2 of HACKING |
| 37 | for an example; on checkout :$ is expanded to include the value. |
| 38 | |
gdt | 2934f28 | 2004-01-05 20:09:00 +0000 | [diff] [blame] | 39 | CHANGELOG |
| 40 | |
| 41 | Add a ChangeLog entry whenever changing code, except for minor fixes |
| 42 | to a commit (with a ChangeLog entry) within the last few days. |
| 43 | |
gdt | 18323bb | 2004-11-05 13:17:20 +0000 | [diff] [blame] | 44 | Most directories have a ChangeLog file; changes to code in that |
| 45 | directory should go in the per-directory ChangeLog. Global or |
| 46 | structural changes should also be mentioned in the top-level |
| 47 | ChangeLog. |
gdt | 2934f28 | 2004-01-05 20:09:00 +0000 | [diff] [blame] | 48 | |
paul | 1f8f61a | 2004-11-05 23:38:20 +0000 | [diff] [blame] | 49 | Certain directories do not contain project code, but contain project |
| 50 | meta-data, eg packaging information, changes to files in these directory may |
| 51 | not require the global ChangeLog to be updated (at the discretion of the |
| 52 | maintainer who usually maintains that meta-data). Also, CVS meta-data such |
| 53 | as cvsignore files do not require ChangeLog updates, just a sane commit |
| 54 | message. |
| 55 | |
gdt | fbb6709 | 2004-11-15 17:29:11 +0000 | [diff] [blame] | 56 | TOOL VERSIONS |
| 57 | |
| 58 | Require versions of support tools are listed in INSTALL.quagga.txt. |
| 59 | Required versions should only be done with due deliberation, as it can |
| 60 | cause environments to no longer be able to compile quagga. |
| 61 | |
gdt | b7a97f8 | 2004-07-23 16:23:56 +0000 | [diff] [blame] | 62 | SHARED LIBRARY VERSIONING |
| 63 | |
| 64 | [this section is at the moment just gdt's opinion] |
| 65 | |
| 66 | Quagga builds several shared libaries (lib/libzebra, ospfd/libospf, |
| 67 | ospfclient/libsopfapiclient). These may be used by external programs, |
| 68 | e.g. a new routing protocol that works with the zebra daemon, or |
| 69 | ospfapi clients. The libtool info pages (node Versioning) explain |
| 70 | when major and minor version numbers should be changed. These values |
| 71 | are set in Makefile.am near the definition of the library. If you |
| 72 | make a change that requires changing the shared library version, |
| 73 | please update Makefile.am. |
| 74 | |
| 75 | libospf exports far more than it should, and is needed by ospfapi |
| 76 | clients. Only bump libospf for changes to functions for which it is |
| 77 | reasonable for a user of ospfapi to call, and please err on the side |
| 78 | of not bumping. |
| 79 | |
| 80 | There is no support intended for installing part of zebra. The core |
| 81 | library libzebra and the included daemons should always be built and |
| 82 | installed together. |
| 83 | |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 84 | PATCH SUBMISSION |
| 85 | |
paul | 85cf0a0 | 2004-01-09 16:34:54 +0000 | [diff] [blame] | 86 | * Send a clean diff against the head of CVS in unified diff format, eg by: |
| 87 | cvs <cvs opts> diff -uwb .... |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 88 | |
| 89 | * Include ChangeLog and NEWS entries as appropriate before the patch |
| 90 | (or in it if you are 100% up to date). |
| 91 | |
gdt | 18323bb | 2004-11-05 13:17:20 +0000 | [diff] [blame] | 92 | * Include only one semantic change or group of changes per patch. |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 93 | |
paul | 85cf0a0 | 2004-01-09 16:34:54 +0000 | [diff] [blame] | 94 | * Do not make gratuitous changes to whitespace. See the w and b arguments |
| 95 | to diff. |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 96 | |
| 97 | * State on which platforms and with what daemons the patch has been |
| 98 | tested. Understand that if the set of testing locations is small, |
| 99 | and the patch might have unforeseen or hard to fix consequences that |
| 100 | there may be a call for testers on quagga-dev, and that the patch |
| 101 | may be blocked until test results appear. |
| 102 | |
| 103 | If there are no users for a platform on quagga-dev who are able and |
| 104 | willing to verify -current occasionally, that platform may be |
| 105 | dropped from the "should be checked" list. |
| 106 | |
| 107 | PATCH APPLICATION TO CVS |
| 108 | |
| 109 | * Only apply patches that meet the submission guidelines. |
| 110 | |
| 111 | * If a patch is large (perhaps more than 100 new/changed lines), tag |
| 112 | the repository before and after the change with e.g. before-foo-fix |
| 113 | and after-foo-fix. |
| 114 | |
| 115 | * If the patch might break something, issue a call for testing on the |
| 116 | mailinglist. |
| 117 | |
paul | 4134ceb | 2004-05-13 13:38:06 +0000 | [diff] [blame] | 118 | * Give an appropriate commit message, eg the ChangeLog entry should suffice, |
paul | 1f8f61a | 2004-11-05 23:38:20 +0000 | [diff] [blame] | 119 | if it does not, then the ChangeLog entry itself needs to be corrected. The |
| 120 | commit message text should be identical to that added to the ChangeLog |
| 121 | message. (One suggestion: when commiting, use your editor to read in the |
| 122 | ChangeLog and delete all previous ChangeLogs.) |
paul | 4134ceb | 2004-05-13 13:38:06 +0000 | [diff] [blame] | 123 | |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 124 | * By committing a patch, you are responsible for fixing problems |
| 125 | resulting from it (or backing it out). |
| 126 | |
| 127 | STABLE PLATFORMS AND DAEMONS |
| 128 | |
| 129 | The list of platforms that should be tested follow. This is a list |
| 130 | derived from what quagga is thought to run on and for which |
| 131 | maintainers can test or there are people on quagga-dev who are able |
| 132 | and willing to verify that -current does or does not work correctly. |
| 133 | |
| 134 | BSD (Free, Net or Open, any platform) # without capabilities |
| 135 | GNU/Linux (any distribution, i386) |
paul | 1f8f61a | 2004-11-05 23:38:20 +0000 | [diff] [blame] | 136 | Solaris (strict alignment, any platform) |
gdt | 18323bb | 2004-11-05 13:17:20 +0000 | [diff] [blame] | 137 | [future: NetBSD/sparc64] |
gdt | d9fd04c | 2003-12-19 19:20:25 +0000 | [diff] [blame] | 138 | |
| 139 | The list of daemons that are thought to be stable and that should be |
| 140 | tested are: |
| 141 | |
| 142 | zebra |
| 143 | bgpd |
| 144 | ripd |
| 145 | ospfd |
| 146 | ripngd |
gdt | 1f431d2 | 2003-12-22 15:45:01 +0000 | [diff] [blame] | 147 | |
gdt | 18323bb | 2004-11-05 13:17:20 +0000 | [diff] [blame] | 148 | Daemons which are in a testing phase are |
| 149 | |
| 150 | ospf6d |
| 151 | isisd |
| 152 | |
jardin | 9e867fe | 2003-12-23 08:56:18 +0000 | [diff] [blame] | 153 | IMPORT OR UPDATE VENDOR SPECIFIC ROUTING PROTOCOLS |
| 154 | |
| 155 | The source code of Quagga is based on two vendors: |
| 156 | |
| 157 | zebra_org (http://www.zebra.org/) |
| 158 | isisd_sf (http://isisd.sf.net/) |
| 159 | |
gdt | 18323bb | 2004-11-05 13:17:20 +0000 | [diff] [blame] | 160 | [20041105: Is isisd.sf.netf still where isisd word is happening, or is |
| 161 | the quagga repo now the canonical place? The last tarball on sf is |
| 162 | two years old. --gdt] |
| 163 | |
jardin | 9e867fe | 2003-12-23 08:56:18 +0000 | [diff] [blame] | 164 | In order to import source code, the following procedure should be used: |
| 165 | |
| 166 | * Tag the Current Quagga CVS repository: |
| 167 | |
| 168 | cvs tag import_isisd_sf_20031223 |
| 169 | |
| 170 | * Import the source code into the Quagga's framework. You must not modified |
| 171 | this source code. It will be merged later. |
| 172 | |
| 173 | cd dir_isisd |
| 174 | export CVSROOT=:pserver:LOGIN@anoncvs.quagga.net:/var/cvsroot |
| 175 | cvs import quagga/isisd isisd_sf isisd_sf_20031223 |
| 176 | ---COMMENTS--- |
| 177 | Vendor: [isisd_sf] Sampo's ISISd from Sourceforge |
| 178 | Tag: [isisd_sf_20031217] Current CVS release |
| 179 | --- |
| 180 | |
| 181 | * Update your Quagga's directory: |
| 182 | |
| 183 | cd dir_quagga |
| 184 | cvs update -dP |
| 185 | |
| 186 | or |
| 187 | |
| 188 | cvs co -d quagga_isisd quagga |
| 189 | |
| 190 | * Merge the code, then commit: |
| 191 | |
| 192 | cvs commit |
| 193 | |