Deleted Added
sdiff udiff text old ( 287823 ) new ( 288310 )
full compact
parse.y (287823) parse.y (288310)
1%{
2/*-
3 * Copyright (c) 2012 The FreeBSD Foundation
4 * All rights reserved.
5 *
6 * This software was developed by Edward Tomasz Napierala under sponsorship
7 * from the FreeBSD Foundation.
8 *

--- 13 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
1%{
2/*-
3 * Copyright (c) 2012 The FreeBSD Foundation
4 * All rights reserved.
5 *
6 * This software was developed by Edward Tomasz Napierala under sponsorship
7 * from the FreeBSD Foundation.
8 *

--- 13 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * $FreeBSD: head/usr.sbin/ctld/parse.y 287823 2015-09-15 13:37:48Z mav $
30 * $FreeBSD: head/usr.sbin/ctld/parse.y 288310 2015-09-27 13:47:28Z mav $
31 */
32
33#include <sys/queue.h>
34#include <sys/types.h>
35#include <sys/stat.h>
36#include <assert.h>
37#include <stdio.h>
38#include <stdlib.h>

--- 13 unchanged lines hidden (view full) ---

52
53extern void yyerror(const char *);
54extern int yylex(void);
55extern void yyrestart(FILE *);
56
57%}
58
59%token ALIAS AUTH_GROUP AUTH_TYPE BACKEND BLOCKSIZE CHAP CHAP_MUTUAL
31 */
32
33#include <sys/queue.h>
34#include <sys/types.h>
35#include <sys/stat.h>
36#include <assert.h>
37#include <stdio.h>
38#include <stdlib.h>

--- 13 unchanged lines hidden (view full) ---

52
53extern void yyerror(const char *);
54extern int yylex(void);
55extern void yyrestart(FILE *);
56
57%}
58
59%token ALIAS AUTH_GROUP AUTH_TYPE BACKEND BLOCKSIZE CHAP CHAP_MUTUAL
60%token CLOSING_BRACKET CTL_LUN DEBUG DEVICE_ID DISCOVERY_AUTH_GROUP
61%token DISCOVERY_FILTER FOREIGN
60%token CLOSING_BRACKET CTL_LUN DEBUG DEVICE_ID DEVICE_TYPE
61%token DISCOVERY_AUTH_GROUP DISCOVERY_FILTER FOREIGN
62%token INITIATOR_NAME INITIATOR_PORTAL ISNS_SERVER ISNS_PERIOD ISNS_TIMEOUT
63%token LISTEN LISTEN_ISER LUN MAXPROC OFFLOAD OPENING_BRACKET OPTION
64%token PATH PIDFILE PORT PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR
65%token TAG TARGET TIMEOUT
66
67%union
68{
69 char *str;

--- 780 unchanged lines hidden (view full) ---

850
851lun_entry:
852 lun_backend
853 |
854 lun_blocksize
855 |
856 lun_device_id
857 |
62%token INITIATOR_NAME INITIATOR_PORTAL ISNS_SERVER ISNS_PERIOD ISNS_TIMEOUT
63%token LISTEN LISTEN_ISER LUN MAXPROC OFFLOAD OPENING_BRACKET OPTION
64%token PATH PIDFILE PORT PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR
65%token TAG TARGET TIMEOUT
66
67%union
68{
69 char *str;

--- 780 unchanged lines hidden (view full) ---

850
851lun_entry:
852 lun_backend
853 |
854 lun_blocksize
855 |
856 lun_device_id
857 |
858 lun_device_type
859 |
858 lun_ctl_lun
859 |
860 lun_option
861 |
862 lun_path
863 |
864 lun_serial
865 |

--- 43 unchanged lines hidden (view full) ---

909 free($2);
910 return (1);
911 }
912 lun_set_device_id(lun, $2);
913 free($2);
914 }
915 ;
916
860 lun_ctl_lun
861 |
862 lun_option
863 |
864 lun_path
865 |
866 lun_serial
867 |

--- 43 unchanged lines hidden (view full) ---

911 free($2);
912 return (1);
913 }
914 lun_set_device_id(lun, $2);
915 free($2);
916 }
917 ;
918
919lun_device_type: DEVICE_TYPE STR
920 {
921 uint64_t tmp;
922
923 if (strcasecmp($2, "disk") == 0 ||
924 strcasecmp($2, "direct") == 0)
925 tmp = 0;
926 else if (strcasecmp($2, "processor") == 0)
927 tmp = 3;
928 else if (strcasecmp($2, "cd") == 0 ||
929 strcasecmp($2, "cdrom") == 0 ||
930 strcasecmp($2, "dvd") == 0 ||
931 strcasecmp($2, "dvdrom") == 0)
932 tmp = 5;
933 else if (expand_number($2, &tmp) != 0 ||
934 tmp > 15) {
935 yyerror("invalid numeric value");
936 free($2);
937 return (1);
938 }
939
940 lun_set_device_type(lun, tmp);
941 }
942 ;
943
917lun_ctl_lun: CTL_LUN STR
918 {
919 uint64_t tmp;
920
921 if (expand_number($2, &tmp) != 0) {
922 yyerror("invalid numeric value");
923 free($2);
924 return (1);

--- 185 unchanged lines hidden --- 		944lun_ctl_lun: CTL_LUN STR
945 {
946 uint64_t tmp;
947
948 if (expand_number($2, &tmp) != 0) {
949 yyerror("invalid numeric value");
950 free($2);
951 return (1);

--- 185 unchanged lines hidden ---