diff -uNr 3cp4218.orig/init/3cload.c 3cp4218/init/3cload.c --- 3cp4218.orig/init/3cload.c Sun Mar 24 21:07:38 2002 +++ 3cp4218/init/3cload.c Mon Jun 3 15:55:36 2002 @@ -147,6 +147,7 @@ #define ADSL_Close 0x04 /* open mode */ +#define ADSL_Open_GDMT 0x03 #define ADSL_Open_ANSI 0x05 #define ADSL_Open_DMT 0x06 #define ADSL_Open_GLITE 0x07 @@ -1472,7 +1473,7 @@ int r; /* open mode */ - int open_mode = ADSL_Open_ANSI; + int open_mode = ADSL_Open_GDMT; /* show program information */ diff -uNr 3cp4218.orig/init/Makefile 3cp4218/init/Makefile --- 3cp4218.orig/init/Makefile Fri Apr 5 20:48:57 2002 +++ 3cp4218/init/Makefile Mon Jun 3 09:21:29 2002 @@ -36,7 +36,7 @@ $(CC) $(CFLAGS) $(INCLUDE_LIBUSB) $(LDFLAGS) 3cioctl.c -o $@ 3cextractdbg: 3cextract.c Makefile - $(CC) $(CFLAGS) -DDEBUG extract.c -o $@ + $(CC) $(CFLAGS) -DDEBUG 3cextract.c -o $@ 3cloaddbg: 3cload.c Makefile $(CC) $(CFLAGS) $(INCLUDE_LIBUSB) $(LDFLAGS) -DDEBUG 3cload.c -o $@ diff -uNr 3cp4218.orig/module/3cp4218.c 3cp4218/module/3cp4218.c --- 3cp4218.orig/module/3cp4218.c Wed May 1 14:05:22 2002 +++ 3cp4218/module/3cp4218.c Wed Jun 5 20:21:26 2002 @@ -22,6 +22,7 @@ #include #include "sarlib.h" +#include "oam.h" //#include "version.h" /* #define DEBUG 1 @@ -100,6 +101,7 @@ #define ADSL_Connection_Opened 0x24 #define ADSL_Connection_Closed 0x25 #define ADSL_Connection_Lost 0x41 +#define ADSL_Open_GDMT 0x03 #define ADSL_Open_ANSI 0x05 #define ADSL_Open_DMT 0x06 #define ADSL_Open_GLITE 0x07 @@ -266,6 +268,11 @@ id_table: udsl_usb_ids, }; +typedef struct udsl_cb { + struct atm_vcc *vcc; + } udsl_cb_t; + + /************ ** ATM ** ************/ @@ -434,7 +441,38 @@ PACKETDEBUG (skb->data, skb->len); - while ( (new = sarlib_decode_rawcell (instance->sarlib_vcc_list, skb, &sarlib_vcc)) != NULL) { + if (oam_is_fm_cell(instance->modem_info.vpi, instance->modem_info.vci, skb)) { + struct atm_vcc *walk; + short vpi = instance->modem_info.vpi; + int vci = instance->modem_info.vci; + PDEBUG("OAM returnable cell detected\n"); + for (walk = instance->atm_dev->vccs; walk; walk = walk->next) { + if (walk->vpi == vpi && walk->vci == vci) { + PDEBUG("Found vcc = %p for sending OAM cell\n", walk); + break; + } + } + if (walk) { + struct atm_vcc *oam_vcc = walk; + struct sk_buff *new; + + if (atomic_read(&oam_vcc->tx_inuse) && !atm_may_send(oam_vcc,skb->len)) { + PDEBUG("Sorry: tx_inuse = %d, size = %d, sndbuf = %d\n", + atomic_read(&oam_vcc->tx_inuse),skb->len,oam_vcc->sk->sndbuf); + } + else { + new = alloc_skb(skb->len,GFP_ATOMIC); + if (new) { + atomic_add(new->truesize+ATM_PDU_OVHD,&oam_vcc->tx_inuse); + skb_put(new, skb->len); + memcpy(new->data,skb->data,skb->len); + PACKETDEBUG(new->data,new->len); + udsl_usb_send_data(instance, oam_vcc, new); + } + } + } + } + else while ( (new = sarlib_decode_rawcell (instance->sarlib_vcc_list, skb, &sarlib_vcc)) != NULL) { PDEBUG("(after cell processing)skb->len = %d\n", new->len); switch (sarlib_vcc->type) { case SARLIB_TYPE_AAL5: @@ -615,10 +653,6 @@ * ****************************************************************************/ -typedef struct udsl_cb { - struct atm_vcc *vcc; - } udsl_cb_t; - static void udsl_usb_send_data_complete(urb_t *urb) { udsl_usb_send_data_context_t *ctx = (udsl_usb_send_data_context_t *)urb->context; struct udsl_instance_data *instance = ctx->instance; @@ -1271,7 +1305,7 @@ return -1; if (udsl_usb_write_status_byte(instance, 0x804c, 0x0f)) return -1; - if (udsl_usb_write_status_byte(instance, TX_COMMAND, ADSL_Open_ANSI)) + if (udsl_usb_write_status_byte(instance, TX_COMMAND, ADSL_Open_GDMT)) return -1; if (udsl_usb_write_status_byte(instance, 0x1cbd, 0x00)) return -1; diff -uNr 3cp4218.orig/module/Makefile 3cp4218/module/Makefile --- 3cp4218.orig/module/Makefile Fri Apr 5 20:50:02 2002 +++ 3cp4218/module/Makefile Thu Jun 6 18:34:06 2002 @@ -10,16 +10,17 @@ # sarlib path SARLIB := ../sarlib +OAM := ../oam #make parameters CC=gcc CFLAGS := -O2 -Wstrict-prototypes -fomit-frame-pointer -fno-strict-aliasing -pipe -fno-strength-reduce -DCPU=686 -march=i686 -Wall -DMODULE -D__KERNEL__ -DLINUX -INCLUDES := -I/usr/src/linux/include/ -I$(SARLIB)/ +INCLUDES := -I/usr/src/linux/include/ -I$(SARLIB)/ -I$(OAM)/ #VERSION := $(shell cat VERSION) #KVERSION := $(shell cat VERSION | tr '.' ','); -MODULES= 3cp4218normal.o $(SARLIB)/sarlib.o +MODULES= 3cp4218normal.o $(SARLIB)/sarlib.o $(OAM)/oam.o #LINUXVERSION := $(shell cat /usr/include/linux/version.h | grep UTS_RELEASE | cut -d '"' -f 2) -DBGMODULES= 3cp4218debug.o $(SARLIB)/sarlibdbg.o +DBGMODULES= 3cp4218debug.o $(SARLIB)/sarlibdbg.o $(OAM)/oamdbg.o ifdef CONFIG_SMP CFLAGS += -D__SMP__ @@ -50,6 +51,16 @@ # +## OAM entries +# +$(OAM)/oam.o: $(OAM)/oam.c $(OAM)/oam.h + make -C $(OAM) + +$(OAM)/oamdbg.o: $(OAM)/oam.c $(OAM)/oam.h + make -C $(OAM) + + +# ## 3Com ADSL Modem USB entries # version.h: VERSION @@ -88,5 +99,5 @@ clean: - /bin/rm -f 3cp4218normal.o sarlib.o sartest 3cp4218.o 3cp4218debug.o 3cp4218dbg.o version.h + /bin/rm -f *~ 3cp4218normal.o sarlib.o sartest 3cp4218.o 3cp4218debug.o 3cp4218dbg.o version.h diff -uNr 3cp4218.orig/oam/COPYING 3cp4218/oam/COPYING --- 3cp4218.orig/oam/COPYING Thu Jan 1 01:00:00 1970 +++ 3cp4218/oam/COPYING Tue Jun 4 15:52:57 2002 @@ -0,0 +1,10 @@ +Program code and documentation are +(C) Copyright 2002 David Lazaro Saz +All rights reserved. + +This package is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +See the file COPYING.GPL for details. diff -uNr 3cp4218.orig/oam/COPYING.GPL 3cp4218/oam/COPYING.GPL --- 3cp4218.orig/oam/COPYING.GPL Thu Jan 1 01:00:00 1970 +++ 3cp4218/oam/COPYING.GPL Tue Jun 4 15:51:48 2002 @@ -0,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -uNr 3cp4218.orig/oam/Makefile 3cp4218/oam/Makefile --- 3cp4218.orig/oam/Makefile Thu Jan 1 01:00:00 1970 +++ 3cp4218/oam/Makefile Tue Jun 4 16:56:22 2002 @@ -0,0 +1,36 @@ +# +## Makefile for the OAM Library +# + +include /usr/src/linux/.config + +# you can add -DCRCASM to get better performance +CFLAGS := -O2 -Wstrict-prototypes -fomit-frame-pointer -fno-strict-aliasing -pipe -fno-strength-reduce -Wall -D__KERNEL__ -DLINUX + +INCLUDES := -I/usr/src/linux/include/ -I/usr/include/ + +VERSION = $(shell cat VERSION) +SHORTVERSION = $(shell cat VERSION | cut -d '.' -f 1-2) +# parse kernel options + +ifdef CONFIG_SMP + CFLAGS += -D__SMP__ +endif + +all: normal debug + +normal: oam.o + +debug: oamdbg.o + +%.o : %.c %.h Makefile + $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ + +%dbg.o : %.c %.h Makefile + $(CC) $(CFLAGS) $(INCLUDES) -DDEBUG -c $< -o $@ + +package: clean + (cd ..; rm oam-$(VERSION); ln -s oam-$(SHORTVERSION) oam-$(VERSION); tar zcvfh oam-$(VERSION).tgz oam-$(VERSION)/); + +clean: + /bin/rm -f *.o *~ diff -uNr 3cp4218.orig/oam/oam.c 3cp4218/oam/oam.c --- 3cp4218.orig/oam/oam.c Thu Jan 1 01:00:00 1970 +++ 3cp4218/oam/oam.c Wed Jun 5 17:26:11 2002 @@ -0,0 +1,171 @@ +/* + * oam.c + * + * Copyright (c) 2002, David Lazaro Saz + * + * This code falls under the GNU GPL. + */ + +#include "oam.h" + + +#ifdef DEBUG + +#define PDEBUG(arg...) printk(KERN_DEBUG "OAM: " arg) + +int oam_print_frame (const unsigned char *data, int len) { + unsigned char buffer[2048]; + int i = 0, j = 0; + int pos; + int nlin; + + if (!data) { + PDEBUG("oam_print_frame NULL pointer\n"); + return 0; + } + if (len < 0) { + PDEBUG("oam_print_frame invalid length\n"); + return 0; + } + nlin = (len / 16) + 1; + if ((nlin * 71) > 1024) { // 71 = 6 + 1 + 16 * 3 + 16 + PDEBUG("oam_print_frame length exceeds buffer\n"); + return 0; + } + + for (i = 0; i < len ; ) { + buffer[0] = '\0'; + sprintf(buffer,"%.3d :", i); + pos = i; + for (j = 0; (j < 16) && (i < len) ; j++, i++) + sprintf(buffer, "%s %2.2x", buffer, data[i]); + for (; j < 16; j++) + sprintf(buffer, "%s ", buffer); + sprintf(buffer, "%s ", buffer); + for (j = 0; (j < 16) && (pos < len) ; j++, pos++) { + if (data[pos] >= ' ' && data[pos] <= 0x7f) + sprintf(buffer, "%s%c", buffer, data[pos]); + else + sprintf(buffer, "%s.", buffer); + } + PDEBUG("%s\n", buffer); + } + return i; + } + +#else +#define PDEBUG(arg...) +#endif /* DEBUG */ + + +#define UNSET_LOOPBACK 0xf0 + + +/* CRC-10 table */ +unsigned short byte_crc10_table[256] = { + 0x000, 0x233, 0x255, 0x066, 0x299, 0x0aa, 0x0cc, 0x2ff, + 0x301, 0x132, 0x154, 0x367, 0x198, 0x3ab, 0x3cd, 0x1fe, + 0x031, 0x202, 0x264, 0x057, 0x2a8, 0x09b, 0x0fd, 0x2ce, + 0x330, 0x103, 0x165, 0x356, 0x1a9, 0x39a, 0x3fc, 0x1cf, + 0x062, 0x251, 0x237, 0x004, 0x2fb, 0x0c8, 0x0ae, 0x29d, + 0x363, 0x150, 0x136, 0x305, 0x1fa, 0x3c9, 0x3af, 0x19c, + 0x053, 0x260, 0x206, 0x035, 0x2ca, 0x0f9, 0x09f, 0x2ac, + 0x352, 0x161, 0x107, 0x334, 0x1cb, 0x3f8, 0x39e, 0x1ad, + 0x0c4, 0x2f7, 0x291, 0x0a2, 0x25d, 0x06e, 0x008, 0x23b, + 0x3c5, 0x1f6, 0x190, 0x3a3, 0x15c, 0x36f, 0x309, 0x13a, + 0x0f5, 0x2c6, 0x2a0, 0x093, 0x26c, 0x05f, 0x039, 0x20a, + 0x3f4, 0x1c7, 0x1a1, 0x392, 0x16d, 0x35e, 0x338, 0x10b, + 0x0a6, 0x295, 0x2f3, 0x0c0, 0x23f, 0x00c, 0x06a, 0x259, + 0x3a7, 0x194, 0x1f2, 0x3c1, 0x13e, 0x30d, 0x36b, 0x158, + 0x097, 0x2a4, 0x2c2, 0x0f1, 0x20e, 0x03d, 0x05b, 0x268, + 0x396, 0x1a5, 0x1c3, 0x3f0, 0x10f, 0x33c, 0x35a, 0x169, + 0x188, 0x3bb, 0x3dd, 0x1ee, 0x311, 0x122, 0x144, 0x377, + 0x289, 0x0ba, 0x0dc, 0x2ef, 0x010, 0x223, 0x245, 0x076, + 0x1b9, 0x38a, 0x3ec, 0x1df, 0x320, 0x113, 0x175, 0x346, + 0x2b8, 0x08b, 0x0ed, 0x2de, 0x021, 0x212, 0x274, 0x047, + 0x1ea, 0x3d9, 0x3bf, 0x18c, 0x373, 0x140, 0x126, 0x315, + 0x2eb, 0x0d8, 0x0be, 0x28d, 0x072, 0x241, 0x227, 0x014, + 0x1db, 0x3e8, 0x38e, 0x1bd, 0x342, 0x171, 0x117, 0x324, + 0x2da, 0x0e9, 0x08f, 0x2bc, 0x043, 0x270, 0x216, 0x025, + 0x14c, 0x37f, 0x319, 0x12a, 0x3d5, 0x1e6, 0x180, 0x3b3, + 0x24d, 0x07e, 0x018, 0x22b, 0x0d4, 0x2e7, 0x281, 0x0b2, + 0x17d, 0x34e, 0x328, 0x11b, 0x3e4, 0x1d7, 0x1b1, 0x382, + 0x27c, 0x04f, 0x029, 0x21a, 0x0e5, 0x2d6, 0x2b0, 0x083, + 0x12e, 0x31d, 0x37b, 0x148, 0x3b7, 0x184, 0x1e2, 0x3d1, + 0x22f, 0x01c, 0x07a, 0x249, 0x0b6, 0x285, 0x2e3, 0x0d0, + 0x11f, 0x32c, 0x34a, 0x179, 0x386, 0x1b5, 0x1d3, 0x3e0, + 0x21e, 0x02d, 0x04b, 0x278, 0x087, 0x2b4, 0x2d2, 0x0e1}; + + +unsigned short update_crc10_by_bytes(unsigned short crc10_accum, + unsigned char *data_blk_ptr, + int data_blk_size) +{ + register int i; + for ( i = 0; i < data_blk_size; i++ ) + { + crc10_accum = ((crc10_accum << 8) & 0x3ff) + ^ byte_crc10_table[( crc10_accum >> 2) & 0xff] + ^ *data_blk_ptr++; + } + return crc10_accum; +} + + +void oam_manage_e2e_f5_loopback_cell(struct sk_buff *skb) +{ + unsigned char *payload = skb->data + + (ATM_CELL_SIZE - ATM_CELL_PAYLOAD); + unsigned short crc10_accum = 0; + + payload[1] &= UNSET_LOOPBACK; + payload[ATM_CELL_PAYLOAD - 2] = 0; + payload[ATM_CELL_PAYLOAD - 1] = 0; + crc10_accum = update_crc10_by_bytes(0, payload, ATM_CELL_PAYLOAD); + payload[ATM_CELL_PAYLOAD - 2] ^= crc10_accum >> 8; + payload[ATM_CELL_PAYLOAD - 1] ^= crc10_accum & 0xff; +} + + +int oam_is_fm_cell(unsigned short vpi, unsigned int vci, struct sk_buff *skb) +{ + unsigned char *cell = skb->data; + unsigned char *payload = cell + (ATM_CELL_SIZE - ATM_CELL_PAYLOAD); + unsigned long atmhdr = ((unsigned long)(cell[0]) << 24) + | ((unsigned long)(cell[1]) << 16) + | ((unsigned long)(cell[2]) << 8) + | (cell[3] & 0xff); + unsigned short pti = (atmhdr & ATM_HDR_PTI_MASK) >> ATM_HDR_PTI_SHIFT; + unsigned short cell_vpi = (atmhdr & ATM_HDR_VPI_MASK) + >> ATM_HDR_VPI_SHIFT; + unsigned long cell_vci = (atmhdr & ATM_HDR_VCI_MASK) + >> ATM_HDR_VCI_SHIFT; + unsigned short fm_type; + + PDEBUG("oam_is_fm_cell " + "(pti = 0x%x, vpi = 0x%x, vci = 0x%x)\n", pti, vpi, vci); +#ifdef DEBUG + oam_print_frame(cell, 53); +#endif + + /* TODO: Check the header CRC */ + + if ( (pti & ATM_PTI_E2EF5) && cell_vpi == vpi && cell_vci == vci) { + fm_type = (payload[0] & OAM_FM_MASK); + PDEBUG("FM type = 0x%x\n", fm_type); + switch (fm_type) { + case OAM_FM_LOOPBACK: + PDEBUG("OAM detected E2E F5 frame\n"); + oam_manage_e2e_f5_loopback_cell(skb); + PDEBUG("OAM after modifying frame\n"); + return(1); + case OAM_FM_AIS: + case OAM_FM_RDI: + default: + PDEBUG("OAM detected an unsupported frame\n"); + /* unsupported */ + } + } + + return 0; +} diff -uNr 3cp4218.orig/oam/oam.h 3cp4218/oam/oam.h --- 3cp4218.orig/oam/oam.h Thu Jan 1 01:00:00 1970 +++ 3cp4218/oam/oam.h Wed Jun 5 00:38:35 2002 @@ -0,0 +1,35 @@ +/* + * oam.h + * + * Copyright (c) 2002, David Lazaro Saz + * + * This code falls under the GNU GPL. + */ + +#ifndef _OAM_H_ +#define _OAM_H_ + +#include +#include +#include + + +/* VPI values identifying F4 cells */ +#define OAM_F4_SEG 0x0003 +#define OAM_F4_E2E 0x0004 + +/* PTI values identifying F5 cells */ +#define OAM_F5_SEG 0x04 /* 100 */ +#define OAM_F5_E2E 0x05 /* 101 */ + +/* Fault management cell types */ +#define OAM_FM_MASK 0x0f +#define OAM_FM_AIS 0x00 +#define OAM_FM_RDI 0x01 +#define OAM_FM_LOOPBACK 0x08 + + +int oam_is_fm_cell(unsigned short vpi, unsigned int vci, struct sk_buff *skb); + + +#endif /* _OAM_H_ */